From a92f5b0351a8779399f7d5e04f72a8855590a6b5 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 1 Dec 2024 18:22:04 -0500 Subject: [PATCH] refactor: correct osx deployment target and move to main CMakeLists.txt --- .github/workflows/continuous-integration.yml | 4 ++-- CMakeLists.txt | 5 +++++ cmake/Build.cmake | 5 ----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 34991b5c7..9d14f3194 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -127,12 +127,12 @@ jobs: runs-on: "macos-14" timeout: 10 arch: arm64 - config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\" -DMACOSX_DEPLOYMENT_TARGET=12" + config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\"" - name: "macos-13-x64" runs-on: macos-13 timeout: 20 - config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\" -DMACOSX_DEPLOYMENT_TARGET=12" + config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\"" - name: "debian-13-x86_64" runs-on: ubuntu-latest diff --git a/CMakeLists.txt b/CMakeLists.txt index 8aa1f31f9..e29251c76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,11 @@ project( message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}") +# Set required macOS SDK +if(APPLE) + set(CMAKE_OSX_DEPLOYMENT_TARGET 12) +endif() + include(cmake/Definitions.cmake) include(cmake/Build.cmake) include(cmake/Libraries.cmake) diff --git a/cmake/Build.cmake b/cmake/Build.cmake index 2827d28ba..fb956fa22 100644 --- a/cmake/Build.cmake +++ b/cmake/Build.cmake @@ -17,11 +17,6 @@ macro(configure_build) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") - if(APPLE) - message(STATUS "Configuring for Apple") - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") - endif() - configure_file(${PROJECT_SOURCE_DIR}/src/lib/gui/gui_config.h.in ${PROJECT_BINARY_DIR}/config/gui_config.h) endmacro()