aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-21 13:05:45 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-21 13:05:45 -0800
commit772528f112f7bddbc09c4519a034f1da7a41cec4 (patch)
tree433704eb474caced2abf80717cd4096b7e7c214f
parent28d3238a8824999df650d8bd9634c09bb8faed72 (diff)
downloadvcpkg-772528f112f7bddbc09c4519a034f1da7a41cec4.tar.gz
vcpkg-772528f112f7bddbc09c4519a034f1da7a41cec4.zip
[soci] Fix to correctly set SOCI_STATIC and SOCI_SHARED
-rw-r--r--ports/soci/portfile.cmake15
1 files changed, 9 insertions, 6 deletions
diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake
index 619d88ebb..ddd37aef2 100644
--- a/ports/soci/portfile.cmake
+++ b/ports/soci/portfile.cmake
@@ -15,19 +15,22 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- set(PORT_EXTRA_OPTIONS -DSOCI_STATIC=ON
- -DSOCI_SHARED=OFF)
-elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- set(PORT_EXTRA_OPTIONS -DSOCI_STATIC=OFF
- -DSOCI_SHARED=ON)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ set(SOCI_STATIC OFF)
+ set(SOCI_DYNAMIC ON)
+elseif(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ set(SOCI_STATIC ON)
+ set(SOCI_DYNAMIC OFF)
endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DSOCI_TESTS=OFF
-DSOCI_CXX_C11=ON
-DLIBDIR=lib
+ -DSOCI_STATIC=${SOCI_STATIC}
+ -DSOCI_SHARED=${SOCI_DYNAMIC}
)
vcpkg_install_cmake()