erkanisik1
77 lines
3.5 KiB
Diff
77 lines
3.5 KiB
Diff
From a496de4b577ca127498e25284e5d9b8736c6dc37 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
|
|
Date: Wed, 14 Aug 2013 12:30:03 +0200
|
|
Subject: [PATCH 1/3] Cmake fixes.
|
|
|
|
---
|
|
CMakeLists.txt | 4 ++--
|
|
CMakeModules/FindFLTK.cmake | 2 +-
|
|
CMakeModules/OsgMacroUtils.cmake | 2 +-
|
|
examples/osgviewerSDL/CMakeLists.txt | 2 +-
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index be8f2b4..95b322b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -988,7 +988,7 @@ IF(BUILD_DOCUMENTATION)
|
|
${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)
|
|
@@ -1004,7 +1004,7 @@ IF(BUILD_DOCUMENTATION)
|
|
${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 --git a/CMakeModules/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake
|
|
index e376b78..9162109 100644
|
|
--- a/CMakeModules/FindFLTK.cmake
|
|
+++ b/CMakeModules/FindFLTK.cmake
|
|
@@ -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}
|
|
~/Library/Frameworks
|
|
diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
|
|
index aa607fa..36df873 100644
|
|
--- a/CMakeModules/OsgMacroUtils.cmake
|
|
+++ b/CMakeModules/OsgMacroUtils.cmake
|
|
@@ -447,7 +447,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
|
|
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 --git a/examples/osgviewerSDL/CMakeLists.txt b/examples/osgviewerSDL/CMakeLists.txt
|
|
index 8498958..c66420f 100644
|
|
--- a/examples/osgviewerSDL/CMakeLists.txt
|
|
+++ b/examples/osgviewerSDL/CMakeLists.txt
|
|
@@ -13,7 +13,7 @@ ELSE()
|
|
# 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()
|
|
|
|
--
|
|
1.8.3.1
|
|
|