Github action for mac intel

VITObelgium · Feb 12, 2025 · 1bd9bf2 · 1bd9bf2
1 parent 7cf2f31
commit 1bd9bf2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/vcpkg-build.yml b/.github/workflows/vcpkg-build.yml
@@ -11,8 +11,9 @@ jobs:
       matrix:
         cfg:
           - { os: ubuntu-latest, triplet: x64-linux }
-          - { os: windows-2022, triplet: x64-windows-static-vs2022 }
-          - { os: macos-13, triplet: x64-osx }
+          - { os: windows-latest, triplet: x64-windows-static-vs2022 }
+          - { os: macos-latest, triplet: arm64-osx }
+          - { os: macos-latest, triplet: x64-osx }
 
     steps:
       - name: install python
@@ -24,10 +25,10 @@ jobs:
         with:
           submodules: true
       - name: Install linux dependencies
-        if: ${{ matrix.cfg.os == 'ubuntu-latest' }}
+        if: ${{ runner.os == 'Linux' }}
         run: sudo apt-get install nasm openssl ninja-build autoconf-archive
       - name: Install osx dependencies
-        if: ${{ matrix.cfg.os == 'macos-13' }}
+        if: ${{ runner.os == 'macOS' }}
         run: brew install nasm ninja automake autoconf autoconf-archive
       - name: Cache vcpkg binary
         id: cache-vcpkg-bin

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,7 +57,6 @@ if(INFRA_IS_TOPLEVEL)
     message(STATUS "Toplevel infra build C++${CMAKE_CXX_STANDARD}")
     set(CMAKE_REQUIRED_FLAGS ${CMAKE_CXX17_STANDARD_COMPILE_OPTION})
 
-    # set(CMAKE_REQUIRED_FLAGS ${CMAKE_CXX17_STANDARD_COMPILE_OPTION})
     if(MSVC OR(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "IntelLLVM"))
         # avoid windows specific warnings
         add_definitions(

diff --git a/deps/vcpkg b/deps/vcpkg
diff --git a/vcpkg.json b/vcpkg.json
@@ -73,7 +73,8 @@
         {
           "name": "gdal",
           "features": [
-            "geos"
+            "geos",
+            "netcdf"
           ]
         }
       ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,8 @@ @@
             {
               "name": "gdal",
               "features": [
-                "geos"
+                "geos",
+                "netcdf"
               ]
             }
           ]
@@ Expand Down @@