Build universal binaries

WE2-800 Signed-off-by: Raul Metsma <[email protected]>
metsma · Aug 11, 2023 · 79b627a · 79b627a
1 parent e817ee2
commit 79b627a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml
@@ -22,7 +22,10 @@ jobs:
           submodules: recursive
 
       - name: Install libraries
-        run: brew install web-eid/gtest/gtest
+        run: |
+          git clone https://github.com/google/googletest.git
+          cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_CXX_STANDARD=17 -S googletest -B gtest-build
+          cmake --build gtest-build --target install
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
@@ -31,16 +34,16 @@ jobs:
           arch: clang_64
 
       - name: Configure
-        run: cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B ${BUILD_DIR} -S .
+        run: cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -B ${BUILD_DIR} -S .
 
       - name: Build
         run: |
           cmake --build ${BUILD_DIR} --config ${BUILD_TYPE}
           cmake --build ${BUILD_DIR} --config ${BUILD_TYPE} --target installer
           cmake --build ${BUILD_DIR} --config ${BUILD_TYPE} --target installer-safari
 
-      #- name: Test
-      #  run: ctest -V -C ${BUILD_TYPE} --test-dir ${BUILD_DIR}
+      - name: Test
+        run: ctest -V -C ${BUILD_TYPE} --test-dir ${BUILD_DIR}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3