From df7bfdb6dee12ac9f70ffcb460f7ea15db0fbe83 Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Fri, 5 Jul 2024 11:14:42 -0300 Subject: [PATCH] Fix macOS CI --- .github/workflows/build.yml | 5 +++++ CMakeLists.txt | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 881479a..f993e15 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,9 @@ jobs: config: - qt_version: "5.15" + macos_architectures: "x86_64" - qt_version: "6.6.0" + macos_architectures: "x86_64;arm64" steps: - name: Install Qt @@ -48,8 +50,11 @@ jobs: - name: Configure project run: > cmake -S . -B ./build -G Ninja + --warn-uninitialized + -Werror=dev -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_MAINTAINER_CFLAGS=${{ matrix.build_type == 'Debug' }} + -DCMAKE_OSX_ARCHITECTURES="${{ matrix.config.macos_architectures }}" - name: Build project run: cmake --build ./build diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c58710..36ccf42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,8 +45,6 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) "/usr" CACHE PATH "simplemail default install prefix" FORCE) endif() -set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries") - option(BUILD_DEMOS "Build the demos" ON) #