From 275a59dd9dc9b6ec324ac9eb5460193bfd53b736 Mon Sep 17 00:00:00 2001 From: codicodi Date: Wed, 11 Jan 2017 21:20:53 +0100 Subject: Add glib --- scripts/cmake/vcpkg_common_functions.cmake | 1 + scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 scripts/cmake/vcpkg_copy_tool_dependencies.cmake (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index ff1fae953..6e60bf2bc 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -11,3 +11,4 @@ include(vcpkg_configure_cmake) include(vcpkg_configure_qmake) include(vcpkg_apply_patches) include(vcpkg_copy_pdbs) +include(vcpkg_copy_tool_dependencies) diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake new file mode 100644 index 000000000..d8de15207 --- /dev/null +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -0,0 +1,16 @@ +# Copy dlls for all tools in ${CURRENT_PACKAGES_DIR}/tools + +function(vcpkg_copy_tool_dependencies) + macro(search_for_dependencies PATH_TO_SEARCH) + file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/tools/*.exe ${CURRENT_PACKAGES_DIR}/tools/*.dll) + foreach(TOOL ${TOOLS}) + execute_process(COMMAND powershell -noprofile -executionpolicy UnRestricted -nologo + -file ${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/applocal.ps1 + -targetBinary ${TOOL} + -installedDir ${PATH_TO_SEARCH} + OUTPUT_VARIABLE OUT) + endforeach() + endmacro() + search_for_dependencies(${CURRENT_PACKAGES_DIR}/bin) + search_for_dependencies(${CURRENT_INSTALLED_DIR}/bin) +endfunction() -- cgit v1.2.3 From ccd3e399f023129a39bb9a402324676a9391a970 Mon Sep 17 00:00:00 2001 From: codicodi Date: Sat, 14 Jan 2017 02:15:34 +0100 Subject: [glib] use win_iconv and add subdir for tools --- scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index d8de15207..32c3eba0d 100644 --- 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 -- cgit v1.2.3 From eb7ccc1223f568d6d2df21b27eb890be93bc8186 Mon Sep 17 00:00:00 2001 From: codicodi Date: Sat, 14 Jan 2017 02:55:41 +0100 Subject: Revert "[glib] use win_iconv and add subdir for tools" This reverts commit ccd3e399f023129a39bb9a402324676a9391a970. --- scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index 32c3eba0d..d8de15207 100644 --- 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 TOOL_DIR +# Copy dlls for all tools in ${CURRENT_PACKAGES_DIR}/tools -function(vcpkg_copy_tool_dependencies TOOL_DIR) +function(vcpkg_copy_tool_dependencies) macro(search_for_dependencies PATH_TO_SEARCH) - file(GLOB TOOLS ${TOOL_DIR}/*.exe ${TOOL_DIR}/*.dll) + file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/tools/*.exe ${CURRENT_PACKAGES_DIR}/tools/*.dll) foreach(TOOL ${TOOLS}) execute_process(COMMAND powershell -noprofile -executionpolicy UnRestricted -nologo -file ${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/applocal.ps1 -- cgit v1.2.3 From f5a0a64e44b885fae8d17b811ee3d3f623ffac3e Mon Sep 17 00:00:00 2001 From: codicodi Date: Sat, 14 Jan 2017 02:59:41 +0100 Subject: [glib] tooools --- scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index d8de15207..432e3c12a 100644 --- 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 -- cgit v1.2.3