From 772528f112f7bddbc09c4519a034f1da7a41cec4 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 21 Nov 2016 13:05:45 -0800 Subject: [soci] Fix to correctly set SOCI_STATIC and SOCI_SHARED --- ports/soci/portfile.cmake | 15 +++++++++------ 1 file 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() -- cgit v1.2.3