Created
October 23, 2013 05:12
-
-
Save nikolaykasyanov/7112907 to your computer and use it in GitHub Desktop.
Patch for Ogre 1.8.1 release that add compatibility with recent Xcode versions.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # HG changeset patch | |
| # User Nikolay Kasyanov <corrmage@gmail.com> | |
| # Date 1375029954 -14400 | |
| # Branch v1-8 | |
| # Node ID 37b1f1b3c594019b2131828ae7d942f53d6a4738 | |
| # Parent 525a7f3bcd4e51b1085c42a8b55fe07eb7700458 | |
| Fix build on CMake >= 2.8.10 | |
| diff --git a/CMakeLists.txt b/CMakeLists.txt | |
| --- a/CMakeLists.txt | |
| +++ b/CMakeLists.txt | |
| @@ -237,10 +237,19 @@ | |
| remove_definitions(-msse) | |
| elseif (APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS) | |
| - # Set 10.5 as the base SDK by default | |
| + set(CMAKE_EXE_LINKER_FLAGS "-F /Library/Frameworks") | |
| + set(CMAKE_SHARED_LINKER_FLAGS "-F /Library/Frameworks") | |
| + set(CMAKE_MODULE_LINKER_FLAGS "-F /Library/Frameworks") | |
| + | |
| + # Set 10.6 as the base SDK by default | |
| set(XCODE_ATTRIBUTE_SDKROOT macosx) | |
| - set(CMAKE_OSX_SYSROOT macosx) | |
| - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) | |
| + if(CMAKE_GENERATOR STREQUAL "Unix Makefiles") | |
| + execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT) | |
| + string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") | |
| + else() | |
| + set(CMAKE_OSX_SYSROOT macosx) | |
| + endif() | |
| + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) | |
| if (NOT CMAKE_OSX_ARCHITECTURES) | |
| set(CMAKE_OSX_ARCHITECTURES ${ARCHS_STANDARD_32_64_BIT}) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment