[OpenSceneGraph] New.
corsepiu
corsepiu at fedoraproject.org
Tue Jun 14 05:59:00 UTC 2011
commit 184c157d202814c9c924196a7244aa7adaf43b62
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Tue Jun 14 07:58:35 2011 +0200
New.
OpenSceneGraph-2.8.5.diff | 57 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
---
diff --git a/OpenSceneGraph-2.8.5.diff b/OpenSceneGraph-2.8.5.diff
new file mode 100644
index 0000000..70351b8
--- /dev/null
+++ b/OpenSceneGraph-2.8.5.diff
@@ -0,0 +1,57 @@
+diff -Naur OpenSceneGraph-2.8.5.orig/CMakeLists.txt OpenSceneGraph-2.8.5/CMakeLists.txt
+--- OpenSceneGraph-2.8.5.orig/CMakeLists.txt 2011-05-22 20:49:43.000000000 +0200
++++ OpenSceneGraph-2.8.5/CMakeLists.txt 2011-06-14 06:55:39.623548693 +0200
+@@ -753,7 +753,7 @@
+ ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
+ )
+ #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
++ #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
+
+ # now set up openthreads documentation generation
+ IF(BUILD_REF_DOCS_TAGFILE)
+@@ -769,7 +769,7 @@
+ ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
+ )
+ #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
+- INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
++ #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
+
+ # Process our other doxyfiles but don't create targets for these
+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
+diff -Naur OpenSceneGraph-2.8.5.orig/CMakeModules/FindFLTK.cmake OpenSceneGraph-2.8.5/CMakeModules/FindFLTK.cmake
+--- OpenSceneGraph-2.8.5.orig/CMakeModules/FindFLTK.cmake 2007-06-25 10:35:06.000000000 +0200
++++ OpenSceneGraph-2.8.5/CMakeModules/FindFLTK.cmake 2011-06-14 06:55:39.624548708 +0200
+@@ -9,7 +9,7 @@
+ #
+ # Created by Robert Osfield.
+
+-FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
++FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.H FL/Fl.h
+ $ENV{FLTK_DIR}/include
+ $ENV{FLTK_DIR}
+ $ENV{OSGDIR}/include
+diff -Naur OpenSceneGraph-2.8.5.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-2.8.5/CMakeModules/OsgMacroUtils.cmake
+--- OpenSceneGraph-2.8.5.orig/CMakeModules/OsgMacroUtils.cmake 2011-04-07 03:58:09.000000000 +0200
++++ OpenSceneGraph-2.8.5/CMakeModules/OsgMacroUtils.cmake 2011-06-14 06:55:39.624548708 +0200
+@@ -373,7 +373,7 @@
+ IF(APPLE)
+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
+ ELSE(APPLE)
+- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
++ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
+ ENDIF(APPLE)
+
+ ENDMACRO(SETUP_EXAMPLE)
+diff -Naur OpenSceneGraph-2.8.5.orig/examples/osgviewerSDL/CMakeLists.txt OpenSceneGraph-2.8.5/examples/osgviewerSDL/CMakeLists.txt
+--- OpenSceneGraph-2.8.5.orig/examples/osgviewerSDL/CMakeLists.txt 2010-03-30 17:23:18.000000000 +0200
++++ OpenSceneGraph-2.8.5/examples/osgviewerSDL/CMakeLists.txt 2011-06-14 06:55:39.624548708 +0200
+@@ -13,7 +13,7 @@
+ # Depending on platform (or SDL version),
+ # this may or may not link successfully.
+ SET(TARGET_SRC osgviewerSDL.cpp)
+- SET(TARGET_EXTERNAL_LIBRARIES ${SDLMAIN_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
++ SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
+ ENDIF()
+ ENDIF()
+
More information about the scm-commits
mailing list