Created
September 4, 2012 22:19
-
-
Save wjwwood/3627336 to your computer and use it in GitHub Desktop.
Patch for visualization_common-1.8.2. To apply run `cd /path/to/visualization_common/` then `patch -p0 < /path/to/this/patch/visualization_common-1.8.2-osx_ogre_pbxcp_ditto.patch`. This patch fixes the compile of ogre on OS X with Xcode greater than 4.4
This file contains 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 -Naur ogre/Makefile ogre/Makefile | |
| --- ogre/Makefile 2012-03-09 13:06:27.000000000 -0800 | |
| +++ ogre/Makefile 2012-09-04 11:43:43.000000000 -0700 | |
| @@ -6,7 +6,7 @@ | |
| SOURCE_DIR = build/$(OGRE_VERSION) | |
| UNPACK_CMD = tar xf | |
| MD5SUM_FILE = $(OGRE_VERSION).tar.bz2.md5sum | |
| -TARBALL_PATCH = hidden_window.patch hidden_window_glx_fix.patch multi_scene_manager.patch | |
| +TARBALL_PATCH = hidden_window.patch hidden_window_glx_fix.patch multi_scene_manager.patch ditto_pbxcp_osx.patch | |
| #INITIAL_DIR = build/ogre | |
| include $(shell rospack find mk)/download_unpack_build.mk | |
| diff -Naur ogre/ditto_pbxcp_osx.patch ogre/ditto_pbxcp_osx.patch | |
| --- ogre/ditto_pbxcp_osx.patch 1969-12-31 16:00:00.000000000 -0800 | |
| +++ ogre/ditto_pbxcp_osx.patch 2012-09-04 12:08:20.000000000 -0700 | |
| @@ -0,0 +1,135 @@ | |
| +diff -Naur Components/Paging/CMakeLists.txt Components/Paging/CMakeLists.txt | |
| +--- Components/Paging/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ Components/Paging/CMakeLists.txt 2012-09-04 11:50:29.000000000 -0700 | |
| +@@ -72,7 +72,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET OgrePaging POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur Components/Property/CMakeLists.txt Components/Property/CMakeLists.txt | |
| +--- Components/Property/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ Components/Property/CMakeLists.txt 2012-09-04 11:50:36.000000000 -0700 | |
| +@@ -52,7 +52,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET OgreProperty POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur Components/RTShaderSystem/CMakeLists.txt Components/RTShaderSystem/CMakeLists.txt | |
| +--- Components/RTShaderSystem/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ Components/RTShaderSystem/CMakeLists.txt 2012-09-04 11:50:48.000000000 -0700 | |
| +@@ -95,7 +95,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET OgreRTShaderSystem POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur Components/Terrain/CMakeLists.txt Components/Terrain/CMakeLists.txt | |
| +--- Components/Terrain/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ Components/Terrain/CMakeLists.txt 2012-09-04 11:50:55.000000000 -0700 | |
| +@@ -77,7 +77,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET OgreTerrain POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur OgreMain/CMakeLists.txt OgreMain/CMakeLists.txt | |
| +--- OgreMain/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ OgreMain/CMakeLists.txt 2012-09-04 11:51:00.000000000 -0700 | |
| +@@ -671,9 +671,9 @@ | |
| + set_target_properties(OgreMain PROPERTIES XCODE_ATTRIBUTE_GCC_UNROLL_LOOPS "YES") | |
| + add_custom_command(TARGET OgreMain POST_BUILD | |
| + COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/Threading | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${OGRE_SOURCE_DIR}/OgreMain/include/Threading/* ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/Threading/ | |
| ++ COMMAND ditto ${OGRE_SOURCE_DIR}/OgreMain/include/Threading/* ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/Threading/ | |
| + COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/OSX | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${OGRE_SOURCE_DIR}/OgreMain/include/OSX/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/OSX/ | |
| ++ COMMAND ditto ${OGRE_SOURCE_DIR}/OgreMain/include/OSX/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/OSX/ | |
| + ) | |
| + else () | |
| + set_target_properties(OgreMain PROPERTIES INSTALL_NAME_DIR "OGRE") | |
| +diff -Naur PlugIns/BSPSceneManager/CMakeLists.txt PlugIns/BSPSceneManager/CMakeLists.txt | |
| +--- PlugIns/BSPSceneManager/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ PlugIns/BSPSceneManager/CMakeLists.txt 2012-09-04 11:51:06.000000000 -0700 | |
| +@@ -56,7 +56,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET Plugin_BSPSceneManager POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur PlugIns/CgProgramManager/CMakeLists.txt PlugIns/CgProgramManager/CMakeLists.txt | |
| +--- PlugIns/CgProgramManager/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ PlugIns/CgProgramManager/CMakeLists.txt 2012-09-04 11:51:13.000000000 -0700 | |
| +@@ -45,7 +45,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET Plugin_CgProgramManager POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur PlugIns/OctreeSceneManager/CMakeLists.txt PlugIns/OctreeSceneManager/CMakeLists.txt | |
| +--- PlugIns/OctreeSceneManager/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ PlugIns/OctreeSceneManager/CMakeLists.txt 2012-09-04 11:51:19.000000000 -0700 | |
| +@@ -61,7 +61,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET Plugin_OctreeSceneManager POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur PlugIns/OctreeZone/CMakeLists.txt PlugIns/OctreeZone/CMakeLists.txt | |
| +--- PlugIns/OctreeZone/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ PlugIns/OctreeZone/CMakeLists.txt 2012-09-04 11:51:23.000000000 -0700 | |
| +@@ -64,7 +64,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET Plugin_OctreeZone POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur PlugIns/PCZSceneManager/CMakeLists.txt PlugIns/PCZSceneManager/CMakeLists.txt | |
| +--- PlugIns/PCZSceneManager/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ PlugIns/PCZSceneManager/CMakeLists.txt 2012-09-04 11:51:29.000000000 -0700 | |
| +@@ -69,7 +69,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET Plugin_PCZSceneManager POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| +diff -Naur PlugIns/ParticleFX/CMakeLists.txt PlugIns/ParticleFX/CMakeLists.txt | |
| +--- PlugIns/ParticleFX/CMakeLists.txt 2011-05-08 11:28:04.000000000 -0700 | |
| ++++ PlugIns/ParticleFX/CMakeLists.txt 2012-09-04 11:51:34.000000000 -0700 | |
| +@@ -87,7 +87,7 @@ | |
| + | |
| + # Copy headers into the main Ogre framework | |
| + add_custom_command(TARGET Plugin_ParticleFX POST_BUILD | |
| +- COMMAND /Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp ARGS -exclude .DS_Store -exclude .hg -exclude 'CMakeLists.txt' -resolve-src-symlinks ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| ++ COMMAND ditto ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/ | |
| + ) | |
| + endif() | |
| + | |
| \ No newline at end of file |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment