Skip to content

Commit da497df

Browse files
committed
Update vcpkg baseline and osx triplets
1 parent 5fba0db commit da497df

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.vcpkg/triplets/arm64-osx.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(VCPKG_OSX_ARCHITECTURES arm64)
44

55
set(VCPKG_CRT_LINKAGE dynamic)
66
set(VCPKG_LIBRARY_LINKAGE dynamic)
7-
if(PORT MATCHES "abseil")
7+
if(PORT MATCHES "abseil" OR PORT MATCHES "re2")
88
set(VCPKG_LIBRARY_LINKAGE static)
99
endif()
1010

.vcpkg/triplets/x64-osx.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ set(VCPKG_TARGET_ARCHITECTURE x64)
22
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
33
set(VCPKG_OSX_ARCHITECTURES x86_64)
44

5-
set(VCPKG_BUILD_TYPE release)
6-
set(VCPKG_C_FLAGS "-O3")
7-
set(VCPKG_CXX_FLAGS "-std=c++17 -O3")
85
set(VCPKG_CRT_LINKAGE dynamic)
96
set(VCPKG_LIBRARY_LINKAGE dynamic)
10-
if(PORT MATCHES "abseil")
7+
if(PORT MATCHES "abseil" OR PORT MATCHES "re2")
118
set(VCPKG_LIBRARY_LINKAGE static)
129
endif()
10+
11+
set(VCPKG_BUILD_TYPE release)
12+
set(VCPKG_C_FLAGS "-O3")
13+
set(VCPKG_CXX_FLAGS "-std=c++17 -O3")

vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"default-registry": {
33
"kind": "git",
4-
"baseline": "26abb5b33f976246a5f2cdc45cdd073d51caff06",
4+
"baseline": "71f123418c6cdc00258964629b0ede4317ba1a36",
55
"repository": "https://github.com/microsoft/vcpkg"
66
},
77
"registries": [

0 commit comments

Comments
 (0)