small changes for latest OSX

terranum-ch · Jun 6, 2024 · a7570d7 · a7570d7
1 parent 05b4b4d
commit a7570d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/osx-build.yml b/.github/workflows/osx-build.yml
@@ -1,4 +1,4 @@
-name: OSX build (Intel)
+name: Build MacOS (Intel)
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-11
+    runs-on: macos-14
 
     steps:
       - uses: actions/checkout@v4

diff --git a/conanfile.py b/conanfile.py
@@ -30,13 +30,14 @@ class Toolmap(ConanFile):
     def requirements(self):
         if self.options.unit_test or self.options.code_coverage:
             self.requires("gtest/1.14.0")
+        if self.settings.os == "Macos":
+            self.requires("json-c/0.17")    # building json-c/0.16 isn't working on latest OSX.
 
     def configure(self):
         if self.options.code_coverage:
             self.options.unit_test = True
 
         self.options["gdal"].with_curl = True # for xml support
-
         self.options["gdal"].shared = True
 
         if self.settings.os == "Linux":

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -40,12 +40,13 @@ if (MSVC)
     set_target_properties(UnitTests PROPERTIES LINK_FLAGS "/ignore:4099")
 endif ()
 
-# Install step for linking *dylib to the executable_path (not a bundle here)
+
+#Install step for linking *dylib to the executable_path (not a bundle here)
 IF (APPLE)
     add_custom_command(
             TARGET UnitTests
             POST_BUILD
-            COMMAND install_name_tool -change @rpath/libgdal.30.dylib @executable_path/libgdal.30.dylib bin/UnitTests
+            COMMAND install_name_tool -change @rpath/libgdal.33.dylib @executable_path/libgdal.33.dylib bin/UnitTests
             COMMENT "Installing GDAL library for Unit testing"
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )