aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-12-04 19:50:23 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-12-04 19:50:23 -0800
commit216f7137b9736d68e698f32154966ea68c7b98db (patch)
tree287b08e57e05805d7803cdec0f74b481cfbf1e4b
parent6c42097aef35368a49fad3d63fd09a9035e1cd4e (diff)
downloadvcpkg-216f7137b9736d68e698f32154966ea68c7b98db.tar.gz
vcpkg-216f7137b9736d68e698f32154966ea68c7b98db.zip
[re2] Don't pass BUILD_SHARED_LIBS
BUILD_SHARED_LIBS should not be locked to shared/static, because the other type will fail. Vcpkg was overriding this flag before, so no behavior change. (i.e. static builds worked before as well). Also tests = OFF.
-rw-r--r--ports/re2/CONTROL2
-rw-r--r--ports/re2/portfile.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL
index 5a37abbaf..89cb6a1a0 100644
--- a/ports/re2/CONTROL
+++ b/ports/re2/CONTROL
@@ -1,3 +1,3 @@
Source: re2
-Version: 2017-12-01
+Version: 2017-12-01-1
Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. \ No newline at end of file
diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake
index 0cc4d9cfa..bc9544db1 100644
--- a/ports/re2/portfile.cmake
+++ b/ports/re2/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS -DRE2_BUILD_TESTING=1 -DBUILD_SHARED_LIBS=1 -DBUILD_TESTING=1
+ OPTIONS -DRE2_BUILD_TESTING=OFF
)
vcpkg_install_cmake()