aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-10-07 16:34:31 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2016-10-07 16:34:31 -0700
commit50fb104f6a36c8a3565c3189f5ce6ac34a74282a (patch)
tree2ae3cd3fb291b06a2b2f32d41908ca1baa66375a /scripts
parent1a95b4a0eca0afe7cb3084ba02dc65931cdd65a0 (diff)
downloadvcpkg-50fb104f6a36c8a3565c3189f5ce6ac34a74282a.tar.gz
vcpkg-50fb104f6a36c8a3565c3189f5ce6ac34a74282a.zip
Change VCPKG_BUILD_SHARED_LIBS to VCPKG_LIBRARY_LINKAGE with values
dynamic or static
Diffstat (limited to 'scripts')
-rw-r--r--scripts/cmake/vcpkg_configure_cmake.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index ec04a0d2f..954c75b82 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -28,8 +28,8 @@ function(vcpkg_configure_cmake)
if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
list(APPEND _csc_OPTIONS -DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION})
endif()
- if(DEFINED VCPKG_BUILD_SHARED_LIBS)
- list(APPEND _csc_OPTIONS -DBUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS})
+ if(DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ list(APPEND _csc_OPTIONS -DBUILD_SHARED_LIBS=ON)
endif()
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")