From 50fb104f6a36c8a3565c3189f5ce6ac34a74282a Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Oct 2016 16:34:31 -0700 Subject: Change VCPKG_BUILD_SHARED_LIBS to VCPKG_LIBRARY_LINKAGE with values dynamic or static --- scripts/cmake/vcpkg_configure_cmake.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') 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") -- cgit v1.2.3