[glib] tooools

microsoft · Jan 14, 2017 · f5a0a64 · f5a0a64
1 parent eb7ccc1
commit f5a0a64
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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)

diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake
@@ -1,8 +1,8 @@
-# Copy dlls for all tools in ${CURRENT_PACKAGES_DIR}/tools
+# Copy dlls for all tools in TOOL_DIR
 
-function(vcpkg_copy_tool_dependencies)
+function(vcpkg_copy_tool_dependencies TOOL_DIR)
     macro(search_for_dependencies PATH_TO_SEARCH)
-        file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/tools/*.exe ${CURRENT_PACKAGES_DIR}/tools/*.dll)
+        file(GLOB TOOLS ${TOOL_DIR}/*.exe ${TOOL_DIR}/*.dll)
         foreach(TOOL ${TOOLS})
             execute_process(COMMAND powershell -noprofile -executionpolicy UnRestricted -nologo
                 -file ${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/applocal.ps1