Skip to content

Commit 937f413

Browse files
committed
fix hardcoded dependency issue on Mac, fixes #189
1 parent f858104 commit 937f413

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ else()
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}

cmake/vcpkg_triplets/arm64-osx-otel-matlab.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ if(${PORT} MATCHES "(curl|zlib)")
55
else()
66
set(VCPKG_LIBRARY_LINKAGE static)
77
endif()
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

915
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
1016
set(VCPKG_OSX_ARCHITECTURES arm64)

cmake/vcpkg_triplets/x86_64-osx-otel-matlab.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ if(${PORT} MATCHES "(curl|zlib)")
55
else()
66
set(VCPKG_LIBRARY_LINKAGE static)
77
endif()
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

914
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
1015
set(VCPKG_OSX_ARCHITECTURES x86_64)

0 commit comments

Comments
 (0)