diff options
| author | Bruce Jones <bruce.david.jones@gmail.com> | 2018-03-07 13:17:52 -0500 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-07 10:17:52 -0800 |
| commit | ae1ce5aaa794c7d3415cabe4f46ea150a01db5ca (patch) | |
| tree | d628356b2b0b11c63a58fa568240e63a30a72bec /scripts | |
| parent | 76f647feb1e6e0cd42ee3de44d92c0d89d5126a6 (diff) | |
| download | vcpkg-ae1ce5aaa794c7d3415cabe4f46ea150a01db5ca.tar.gz vcpkg-ae1ce5aaa794c7d3415cabe4f46ea150a01db5ca.zip | |
applocal-deps applied to MODULE_LIBRARY target too (#2972)
* Fix for issue #2786
* [vcpkg-cmake-toolchain] Only applocal dependencies for shared libraries
* applocal-deps applied to MODULE_LIBRARY target too
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 2f3af6598..b3e27b5d0 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -170,7 +170,7 @@ function(add_library name) list(FIND ARGV "ALIAS" ALIAS_IDX) if(IMPORTED_IDX EQUAL -1 AND INTERFACE_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) get_target_property(IS_LIBRARY_SHARED ${name} TYPE) - if(VCPKG_APPLOCAL_DEPS AND _VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp" AND IS_LIBRARY_SHARED STREQUAL "SHARED_LIBRARY") + if(VCPKG_APPLOCAL_DEPS AND _VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp" AND (IS_LIBRARY_SHARED STREQUAL "SHARED_LIBRARY" OR IS_LIBRARY_SHARED STREQUAL "MODULE_LIBRARY")) add_custom_command(TARGET ${name} POST_BUILD COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1 -targetBinary $<TARGET_FILE:${name}> |