zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 06:42:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

- set macOS deployment target in CMake

Browse source 
Removed explicit version selection from Travis configuration
Bug in particular version of CMake requires CMAKE_OSX_SYSROOT to be set to existing SDK name for Xcode 8
https://cmake.org/pipermail/cmake/2012-November/052649.html
This commit is contained in:
alexey.lysiuk 2020-01-05 10:50:14 +02:00
parent 26784d7453
commit 4dc6ea4091
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -14,13 +14,13 @@ matrix:
os: osx os: osx
osx_image: xcode8 osx_image: xcode8
env: env:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9" - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_OSX_SYSROOT=macosx10.12"
- name: "Xcode 11.3" - name: "Xcode 11.3"
os: osx os: osx
osx_image: xcode11.3 osx_image: xcode11.3
env: env:
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9" - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release"
- name: "Visual Studio 2017 32-bit" - name: "Visual Studio 2017 32-bit"
os: windows os: windows

1
CMakeLists.txt
View file

@ -288,6 +288,7 @@ else()
if( APPLE ) if( APPLE )
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
if( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) if( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
# With standard Apple tools -stdlib=libc++ needs to be specified in order to get # With standard Apple tools -stdlib=libc++ needs to be specified in order to get
# C++11 support using SDKs 10.7 and 10.8. # C++11 support using SDKs 10.7 and 10.8.