build: update CI

cdcseacave · Jul 27, 2024 · 7b01622 · 7b01622
1 parent d726211
commit 7b01622
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -32,33 +32,39 @@ jobs:
             triplet: x64-linux-release
             build-type: Release
           - os: macos-latest
-            triplet: x64-osx
+            triplet: arm64-osx
             build-type: Release
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Restore artifacts, or setup vcpkg for building artifacts
         uses: lukka/run-vcpkg@v11
         with:
           vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-          vcpkgGitCommitId: '4a3c366f2d0d0eaf034bfa649124768df7cfe813'
+          vcpkgGitCommitId: '1de2026f28ead93ff1773e6e680387643e914ea1'
 
       - name: Install Ubuntu dependencies
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y autoconf-archive libxmu-dev libdbus-1-dev libxtst-dev libxi-dev libxinerama-dev libxcursor-dev xorg-dev libgl-dev libglu1-mesa-dev pkg-config
+          sudo apt-get install -y autoconf-archive libxmu-dev libdbus-1-dev libxtst-dev libxi-dev libxinerama-dev libxcursor-dev xorg-dev libgl-dev libglu1-mesa-dev pkg-config ninja-build
 
       - name: Install macOS dependencies
         if: matrix.os == 'macOS-latest'
         run: |
-          brew install automake autoconf-archive
+          brew install automake autoconf autoconf-archive libtool ninja
 
-      - name: Configure CMake
+      - name: Configure CMake for Windows
+        if: matrix.os == 'windows-latest'
         run: |
           cmake -S . -B make -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DOpenMVS_USE_CUDA=OFF
 
+      - name: Configure CMake for Ubuntu and macOS
+        if: matrix.os != 'windows-latest'
+        run: |
+          cmake -S . -B make -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} -DOpenMVS_USE_CUDA=OFF -G Ninja
+
       - name: Build
         working-directory: ./make
         run: |

diff --git a/build/Utils.cmake b/build/Utils.cmake
@@ -496,6 +496,9 @@ macro(optimize_default_compiler_settings)
 		add_extra_compiler_option(-Wno-unnamed-type-template-args)
 		add_extra_compiler_option(-Wno-int-in-bool-context)
 		add_extra_compiler_option(-Wno-deprecated-declarations)
+		add_extra_compiler_option(-Wno-deprecated-anon-enum-enum-conversion)
+		add_extra_compiler_option(-Wno-deprecated-enum-compare-conditional)
+		add_extra_compiler_option(-Wno-deprecated-enum-enum-conversion)
 	  endif()
 	  add_extra_compiler_option(-fdiagnostics-show-option)
 	  add_extra_compiler_option(-ftemplate-backtrace-limit=0)