From 582a35c82d35772f73b8b2347ef6623535a7c427 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Wed, 27 Mar 2019 00:30:27 +0100 Subject: [PATCH 1/2] [skip appveyor] ci: bump OSX to 10.14 and xcode to 10.2 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca67c869335..12735fb419c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 06a759ecc4db1add9409183945b02b2be5790610 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Wed, 27 Mar 2019 01:12:32 +0100 Subject: [PATCH 2/2] CMake: set CMP0068 and default CMAKE_OSX_ARCHITECTURES to x86_64 --- CMakeLists.txt | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12726dca38d..7acb55efe07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 () @@ -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 ()