Skip to content

Commit cade41f

Browse files
authored
Set macOS RPATH to loader_path (#77)
1 parent 77f2341 commit cade41f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595

9696
build-mac:
9797
name: "Build - macOS"
98-
runs-on: macOS-11
98+
runs-on: macOS-14
9999
steps:
100100
- uses: actions/checkout@v3
101101
with:
@@ -113,7 +113,7 @@ jobs:
113113

114114
build-mac-arm:
115115
name: "Build - macOS (Arm)"
116-
runs-on: macos-11
116+
runs-on: macOS-14
117117
steps:
118118
- uses: actions/checkout@v3
119119
with:

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ if (project.platform == "linux-athena") {
251251
'-DOPENCV_EXTRA_FLAGS_DEBUG=-Og' +
252252
"-DCMAKE_MODULE_PATH=$rootDir/arm-frc-modules"
253253
} else if (project.platform == "osx-arm64") {
254-
return args + "-DCMAKE_OSX_ARCHITECTURES=arm64" + "-DCMAKE_OSX_DEPLOYMENT_TARGET:String=11.0"
254+
return args + "-DCMAKE_OSX_ARCHITECTURES=arm64" + "-DCMAKE_OSX_DEPLOYMENT_TARGET:String=13.0" + "-DCMAKE_BUILD_RPATH=@loader_path"
255255
} else if (project.platform == "osx-x86_64") {
256-
return args + "-DCMAKE_OSX_ARCHITECTURES=x86_64" + "-DCMAKE_OSX_DEPLOYMENT_TARGET:String=10.15"
256+
return args + "-DCMAKE_OSX_ARCHITECTURES=x86_64" + "-DCMAKE_OSX_DEPLOYMENT_TARGET:String=13.0" + "-DCMAKE_BUILD_RPATH=@loader_path"
257257
} else if (project.platform == "windows-arm64") {
258258
return args + "-DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE" + "-DAARCH64=ON"
259259
}

0 commit comments

Comments
 (0)