aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorcodicodi <rob.ceglinski@gmail.com>2017-01-14 02:59:41 +0100
committercodicodi <rob.ceglinski@gmail.com>2017-01-14 02:59:41 +0100
commitf5a0a64e44b885fae8d17b811ee3d3f623ffac3e (patch)
treedf95950598e51879d5143067a4e1e90918dbfd18 /ports
parenteb7ccc1223f568d6d2df21b27eb890be93bc8186 (diff)
downloadvcpkg-f5a0a64e44b885fae8d17b811ee3d3f623ffac3e.tar.gz
vcpkg-f5a0a64e44b885fae8d17b811ee3d3f623ffac3e.zip
[glib] tooools
Diffstat (limited to 'ports')
-rw-r--r--ports/glib/CMakeLists.txt4
-rw-r--r--ports/glib/portfile.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt
index 79d460bab..1cf65d0a7 100644
--- a/ports/glib/CMakeLists.txt
+++ b/ports/glib/CMakeLists.txt
@@ -123,7 +123,7 @@ endmacro()
if(NOT GLIB_SKIP_TOOLS)
configure_file(gobject/glib-mkenums.in ${CMAKE_SOURCE_DIR}/gobject/glib-mkenums @ONLY) # uses GLIB_VERSION
- install(FILES gobject/glib-mkenums DESTINATION tools)
+ install(FILES gobject/glib-mkenums DESTINATION tools/glib)
add_gio_tool(gdbus gio/gdbus-tool.c)
add_gio_tool(gio-querymodules gio/gio-querymodules.c)
@@ -145,7 +145,7 @@ if(NOT GLIB_SKIP_TOOLS)
add_glib_tool(gspawn-${WIN}-helper WIN32 glib/gspawn-win32-helper.c)
add_glib_tool(gspawn-${WIN}-helper-console glib/gspawn-win32-helper-console.c)
- install(TARGETS ${GLIB_TOOLS} RUNTIME DESTINATION tools)
+ install(TARGETS ${GLIB_TOOLS} RUNTIME DESTINATION tools/glib)
endif()
install(TARGETS ${GLIB_TARGETS} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
index d1777de1d..71f1f366c 100644
--- a/ports/glib/portfile.cmake
+++ b/ports/glib/portfile.cmake
@@ -35,7 +35,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies()
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/glib)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/glib)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/glib/COPYING ${CURRENT_PACKAGES_DIR}/share/glib/copyright)