File tree Expand file tree Collapse file tree 3 files changed +12
-1
lines changed
Expand file tree Collapse file tree 3 files changed +12
-1
lines changed Original file line number Diff line number Diff line change 2828
2929 set (VCPKG_FETCH_CONTENT_NAME vcpkg)
3030 set (VCPKG_GIT_REPOSITORY "https://github.com/microsoft/vcpkg.git" )
31- set (VCPKG_GIT_TAG "f7423ee " )
31+ set (VCPKG_GIT_TAG "b02e341 " )
3232 FetchContent_Declare(
3333 ${VCPKG_FETCH_CONTENT_NAME}
3434 GIT_REPOSITORY ${VCPKG_GIT_REPOSITORY}
Original file line number Diff line number Diff line change @@ -5,6 +5,12 @@ if(${PORT} MATCHES "(curl|zlib)")
55else ()
66 set (VCPKG_LIBRARY_LINKAGE static )
77endif ()
8+ +# disable the script to fix rpath for curl, which makes an undesirable change to
9+ +# the install name from @rpath/libcurl.4.dylib to @rpath/libcurl.4.8.0.dylib
10+ +if(${PORT} MATCHES "curl" )
11+ + set(VCPKG_FIXUP_MACHO_RPATH OFF )
12+ +endif()
13+
814
915set (VCPKG_CMAKE_SYSTEM_NAME Darwin)
1016set (VCPKG_OSX_ARCHITECTURES arm64)
Original file line number Diff line number Diff line change @@ -5,6 +5,11 @@ if(${PORT} MATCHES "(curl|zlib)")
55else ()
66 set (VCPKG_LIBRARY_LINKAGE static )
77endif ()
8+ +# disable the script to fix rpath for curl, which makes an undesirable change to
9+ +# the install name from @rpath/libcurl.4.dylib to @rpath/libcurl.4.8.0.dylib
10+ +if(${PORT} MATCHES "curl" )
11+ + set(VCPKG_FIXUP_MACHO_RPATH OFF )
12+ +endif()
813
914set (VCPKG_CMAKE_SYSTEM_NAME Darwin)
1015set (VCPKG_OSX_ARCHITECTURES x86_64)
You can’t perform that action at this time.
0 commit comments