0001-Cmake-fixes.patch 3.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677
  1. From a496de4b577ca127498e25284e5d9b8736c6dc37 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
  3. Date: Wed, 14 Aug 2013 12:30:03 +0200
  4. Subject: [PATCH 1/3] Cmake fixes.
  5. ---
  6. CMakeLists.txt | 4 ++--
  7. CMakeModules/FindFLTK.cmake | 2 +-
  8. CMakeModules/OsgMacroUtils.cmake | 2 +-
  9. examples/osgviewerSDL/CMakeLists.txt | 2 +-
  10. 4 files changed, 5 insertions(+), 5 deletions(-)
  11. diff --git a/CMakeLists.txt b/CMakeLists.txt
  12. index be8f2b4..95b322b 100644
  13. --- a/CMakeLists.txt
  14. +++ b/CMakeLists.txt
  15. @@ -988,7 +988,7 @@ IF(BUILD_DOCUMENTATION)
  16. ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
  17. )
  18. #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
  19. - INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
  20. + #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
  21. # now set up openthreads documentation generation
  22. IF(BUILD_REF_DOCS_TAGFILE)
  23. @@ -1004,7 +1004,7 @@ IF(BUILD_DOCUMENTATION)
  24. ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
  25. )
  26. #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
  27. - INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
  28. + #INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
  29. # Process our other doxyfiles but don't create targets for these
  30. CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
  31. diff --git a/CMakeModules/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake
  32. index e376b78..9162109 100644
  33. --- a/CMakeModules/FindFLTK.cmake
  34. +++ b/CMakeModules/FindFLTK.cmake
  35. @@ -9,7 +9,7 @@
  36. #
  37. # Created by Robert Osfield.
  38. -FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
  39. +FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.H FL/Fl.h
  40. $ENV{FLTK_DIR}/include
  41. $ENV{FLTK_DIR}
  42. ~/Library/Frameworks
  43. diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
  44. index aa607fa..36df873 100644
  45. --- a/CMakeModules/OsgMacroUtils.cmake
  46. +++ b/CMakeModules/OsgMacroUtils.cmake
  47. @@ -447,7 +447,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
  48. IF(APPLE)
  49. INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
  50. ELSE(APPLE)
  51. - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
  52. + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
  53. ENDIF(APPLE)
  54. ENDMACRO(SETUP_EXAMPLE)
  55. diff --git a/examples/osgviewerSDL/CMakeLists.txt b/examples/osgviewerSDL/CMakeLists.txt
  56. index 8498958..c66420f 100644
  57. --- a/examples/osgviewerSDL/CMakeLists.txt
  58. +++ b/examples/osgviewerSDL/CMakeLists.txt
  59. @@ -13,7 +13,7 @@ ELSE()
  60. # Depending on platform (or SDL version),
  61. # this may or may not link successfully.
  62. SET(TARGET_SRC osgviewerSDL.cpp)
  63. - SET(TARGET_EXTERNAL_LIBRARIES ${SDLMAIN_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
  64. + SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
  65. ENDIF()
  66. ENDIF()
  67. --
  68. 1.8.3.1