aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Boldyrev <miboldyrev@gmail.com>2020-02-07 20:34:22 +0300
committerGitHub <noreply@github.com>2020-02-07 09:34:22 -0800
commit209b2e3355ca3732df8a0f840eef06b5f29b215a (patch)
tree2690157d80d22d79a119a0f27c26905a3724dc56
parent50d1e2998ec2a4df87d28802411c98336e20a128 (diff)
downloadvcpkg-209b2e3355ca3732df8a0f840eef06b5f29b215a.tar.gz
vcpkg-209b2e3355ca3732df8a0f840eef06b5f29b215a.zip
[soci] fixed SOCI_CXX11 flag (#9887)
* [soci] fixed SOCI_CXX11 flag Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com> * [soci] removed vcpkg_common_functions include Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com>
-rw-r--r--ports/soci/CONTROL2
-rw-r--r--ports/soci/portfile.cmake3
2 files changed, 2 insertions, 3 deletions
diff --git a/ports/soci/CONTROL b/ports/soci/CONTROL
index 2aa095191..96c8f48de 100644
--- a/ports/soci/CONTROL
+++ b/ports/soci/CONTROL
@@ -1,5 +1,5 @@
Source: soci
-Version: 4.0.0
+Version: 4.0.0-1
Homepage: https://github.com/SOCI/soci
Description: SOCI database access library
diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake
index 9ba44d8bf..3bfc519f9 100644
--- a/ports/soci/portfile.cmake
+++ b/ports/soci/portfile.cmake
@@ -1,4 +1,3 @@
-include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO SOCI/soci
@@ -31,7 +30,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DSOCI_TESTS=OFF
- -DSOCI_CXX_C11=ON
+ -DSOCI_CXX11=ON
-DSOCI_LIBDIR:STRING=lib # This is to always have output in the lib folder and not lib64 for 64-bit builds
-DLIBDIR:STRING=lib
-DSOCI_STATIC=${SOCI_STATIC}