refactor: correct osx deployment target and move to main CMakeLists.txt

This commit is contained in:
sithlord48 2024-12-01 18:22:04 -05:00 committed by Chris Rizzitello
parent 0f0846f011
commit a92f5b0351
3 changed files with 7 additions and 7 deletions

View file

@ -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

View file

@ -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)

View file

@ -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()