Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[skip appveyor] ci: bump OSX to 10.4 and xcode to 10.2 #1145

Merged
merged 2 commits into from
Mar 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ addons:
- nvidia-cg-dev
- swig3.0
before_script:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install freetype libzzip sdl2 ; fi
osx_image: xcode10.1
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install libzzip sdl2 ; fi
osx_image: xcode10.2
env:
- TEST=TRUE
- GL3ES=TRUE # build GL3Plus and GLES2 Rendersystems
Expand Down
26 changes: 9 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,15 @@ if (APPLE AND NOT ANDROID)
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")


if(POLICY CMP0068)
cmake_policy(SET CMP0068 NEW) # CMake 3.9+: `RPATH` settings on macOS do not affect `install_name`.
endif()

if (NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "") # target the common case
endif()

# otherwise apple defines a macro named check that conflicts with boost
add_definitions(-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0)
endif ()
Expand Down Expand Up @@ -273,22 +281,6 @@ elseif (APPLE AND NOT APPLE_IOS)
set(CMAKE_OSX_SYSROOT macosx)
endif()

if (NOT CMAKE_OSX_ARCHITECTURES)
if(OGRE_BUILD_RENDERSYSTEM_GL3PLUS)
if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
set(CMAKE_OSX_ARCHITECTURES "${ARCHS_STANDARD_64_BIT}")
else()
set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_64_BIT)")
endif()
else()
if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
set(CMAKE_OSX_ARCHITECTURES "${ARCHS_STANDARD_32_64_BIT}")
else()
set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_64_BIT)")
endif()
endif()
endif()

# Make sure that the OpenGL render system is selected for non-iOS Apple builds
set(OGRE_BUILD_RENDERSYSTEM_GLES2 FALSE)
endif ()
Expand Down