StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

feat(osx): Add support for macOS 10.16, remove support for macOS 10.13

Browse Source 
Stop specifying a specific path in cmake for the SDK, since the path differs in
10.16, and cmake will find it automatically.

Use the oldest supported SDK based on https://developer.apple.com/support/xcode/

Fix #6252
This commit is contained in:
Anthony Bilinski 2020-11-21 02:36:46 -08:00
parent b42b1f5e15
commit a93c599497
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -146,7 +146,7 @@ jobs:
- /opt/build-windows/x86_64 - /opt/build-windows/x86_64
- stage: "macOS, AppImage and Flatpak" - stage: "macOS, AppImage and Flatpak"
os: osx os: osx
osx_image: xcode9.3 osx_image: xcode10.2 # macOS 10.14, oldest supported SDK according to https://developer.apple.com/support/xcode/
env: JOB=build-osx env: JOB=build-osx
cache: cache:
timeout: 300 # seconds timeout: 300 # seconds

9
CMakeLists.txt
View File

@ -60,15 +60,6 @@ execute_process(
OUTPUT_VARIABLE QT_PREFIX_PATH OUTPUT_VARIABLE QT_PREFIX_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(
COMMAND xcode-select -p
OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
set(CMAKE_OSX_SYSROOT
${CMAKE_OSX_SYSROOT}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk)
project(qtox) project(qtox)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.