Last active
December 30, 2015 18:28
-
-
Save nikolaykasyanov/7867361 to your computer and use it in GitHub Desktop.
Patches to be used with Ogre homebrew formula
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
| diff --git a/CMakeLists.txt b/CMakeLists.txt | |
| --- a/CMakeLists.txt | |
| +++ b/CMakeLists.txt | |
| @@ -237,10 +237,15 @@ | |
| remove_definitions(-msse) | |
| elseif (APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS) | |
| - # Set 10.5 as the base SDK by default | |
| + # 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}) |
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
| diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt | |
| --- a/OgreMain/CMakeLists.txt | |
| +++ b/OgreMain/CMakeLists.txt | |
| @@ -707,11 +707,6 @@ | |
| set_target_properties(OgreMain PROPERTIES INSTALL_NAME_DIR "OGRE") | |
| else () | |
| set_target_properties(OgreMain PROPERTIES FRAMEWORK TRUE) | |
| - # Set the INSTALL_PATH so that Frameworks can be local | |
| - set_target_properties(OgreMain | |
| - PROPERTIES BUILD_WITH_INSTALL_RPATH 1 | |
| - INSTALL_NAME_DIR "@executable_path/../Frameworks" | |
| - ) | |
| set_target_properties(OgreMain PROPERTIES PUBLIC_HEADER "${HEADER_FILES}") | |
| set_target_properties(OgreMain PROPERTIES RESOURCE "${RESOURCE_FILES}") | |
| set_source_files_properties("${RESOURCE_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment