Set macOS min version to macOS 12.0 (#7381)
* Set macOS min version to 12 * Update ChangeLog
This commit is contained in:
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -120,14 +120,12 @@ jobs:
|
||||
timeout: 10
|
||||
os: "macos-14"
|
||||
arch: arm64
|
||||
version: "11"
|
||||
shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}"
|
||||
|
||||
- name: "macos-10-intel"
|
||||
timeout: 20
|
||||
os: "macos-14-large"
|
||||
arch: x64
|
||||
version: "10.14"
|
||||
shell: "bash"
|
||||
|
||||
steps:
|
||||
@ -140,8 +138,6 @@ jobs:
|
||||
run: ./scripts/install_deps.py
|
||||
|
||||
- name: Configure
|
||||
env:
|
||||
CMAKE_OSX_DEPLOYMENT_TARGET: ${{ matrix.target.version }}
|
||||
run: cmake -B build --preset=macos-release -DCMAKE_PREFIX_PATH=$(brew --prefix qt@6)
|
||||
|
||||
- name: Build
|
||||
|
||||
@ -48,6 +48,7 @@ Enhancements:
|
||||
- #7378 Improve workflow triggers to ensure correct run time
|
||||
- #7379 Resolve Qt framework path with `install_name_tool`
|
||||
- #7380 Add `qt6-qpa-plugins` Qt dependency for Debian
|
||||
- #7381 Set macOS min version to macOS 12.0
|
||||
|
||||
# 1.14.6
|
||||
|
||||
|
||||
@ -22,6 +22,10 @@ macro(configure_definitions)
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
|
||||
endif()
|
||||
|
||||
configure_ninja()
|
||||
configure_options()
|
||||
|
||||
|
||||
@ -149,23 +149,6 @@ macro(configure_mac_libs)
|
||||
"--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1"
|
||||
)
|
||||
|
||||
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
|
||||
endif()
|
||||
|
||||
if(CMAKE_OSX_DEPLOYMENT_TARGET GREATER_EQUAL 11.0)
|
||||
set(SYNERGY_OSX_DEPLOYMENT_TARGET 1100)
|
||||
elseif(CMAKE_OSX_DEPLOYMENT_TARGET GREATER_EQUAL 10.15)
|
||||
set(SYNERGY_OSX_DEPLOYMENT_TARGET 1015)
|
||||
elseif(CMAKE_OSX_DEPLOYMENT_TARGET GREATER_EQUAL 10.14)
|
||||
set(SYNERGY_OSX_DEPLOYMENT_TARGET 1014)
|
||||
else()
|
||||
set(SYNERGY_OSX_DEPLOYMENT_TARGET 1013)
|
||||
endif()
|
||||
|
||||
add_compile_definitions(
|
||||
OSX_DEPLOYMENT_TARGET=${SYNERGY_OSX_DEPLOYMENT_TARGET})
|
||||
|
||||
find_library(lib_ScreenSaver ScreenSaver)
|
||||
find_library(lib_IOKit IOKit)
|
||||
find_library(lib_ApplicationServices ApplicationServices)
|
||||
@ -181,10 +164,8 @@ macro(configure_mac_libs)
|
||||
${lib_Foundation}
|
||||
${lib_Carbon})
|
||||
|
||||
if(SYNERGY_OSX_DEPLOYMENT_TARGET GREATER_EQUAL 1014)
|
||||
find_library(lib_UserNotifications UserNotifications)
|
||||
list(APPEND libs ${lib_UserNotifications})
|
||||
endif()
|
||||
find_library(lib_UserNotifications UserNotifications)
|
||||
list(APPEND libs ${lib_UserNotifications})
|
||||
|
||||
add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user