Set macOS RPATH to loader_path (#77)

wpilibsuite · Jun 5, 2024 · cade41f · cade41f
1 parent 77f2341
commit cade41f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -95,7 +95,7 @@ jobs:
 
   build-mac:
     name: "Build - macOS"
-    runs-on: macOS-11
+    runs-on: macOS-14
     steps:
       - uses: actions/checkout@v3
         with:
@@ -113,7 +113,7 @@ jobs:
 
   build-mac-arm:
     name: "Build - macOS (Arm)"
-    runs-on: macos-11
+    runs-on: macOS-14
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/build.gradle b/build.gradle
@@ -251,9 +251,9 @@ if (project.platform == "linux-athena") {
                     '-DOPENCV_EXTRA_FLAGS_DEBUG=-Og' +
                     "-DCMAKE_MODULE_PATH=$rootDir/arm-frc-modules"
             } else if (project.platform == "osx-arm64") {
-                return args + "-DCMAKE_OSX_ARCHITECTURES=arm64" + "-DCMAKE_OSX_DEPLOYMENT_TARGET:String=11.0"
+                return args + "-DCMAKE_OSX_ARCHITECTURES=arm64" + "-DCMAKE_OSX_DEPLOYMENT_TARGET:String=13.0" + "-DCMAKE_BUILD_RPATH=@loader_path"
             } else if (project.platform == "osx-x86_64") {
-                return args + "-DCMAKE_OSX_ARCHITECTURES=x86_64" + "-DCMAKE_OSX_DEPLOYMENT_TARGET:String=10.15"
+                return args + "-DCMAKE_OSX_ARCHITECTURES=x86_64" + "-DCMAKE_OSX_DEPLOYMENT_TARGET:String=13.0" + "-DCMAKE_BUILD_RPATH=@loader_path"
             } else if (project.platform == "windows-arm64") {
                 return args + "-DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE" + "-DAARCH64=ON"
             }