You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
88 lines
4.4 KiB
88 lines
4.4 KiB
--- OpenSceneGraph-3.4.0/CMakeLists.txt
|
|
+++ OpenSceneGraph-3.4.0/CMakeLists.txt
|
|
@@ -76,6 +76,7 @@
|
|
SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
|
|
ENDIF(NOT CMAKE_BUILD_TYPE)
|
|
|
|
+INCLUDE(MacroOptionalFindPackage)
|
|
|
|
IF(ANDROID)
|
|
INCLUDE(OsgAndroidMacroUtils)--- OpenSceneGraph-3.4.0/CMakeModules/COPYING-CMAKE-SCRIPTS
|
|
+++ OpenSceneGraph-3.4.0/CMakeModules/COPYING-CMAKE-SCRIPTS
|
|
@@ -0,0 +1,22 @@
|
|
+Redistribution and use in source and binary forms, with or without
|
|
+modification, are permitted provided that the following conditions
|
|
+are met:
|
|
+
|
|
+1. Redistributions of source code must retain the copyright
|
|
+ notice, this list of conditions and the following disclaimer.
|
|
+2. Redistributions in binary form must reproduce the copyright
|
|
+ notice, this list of conditions and the following disclaimer in the
|
|
+ documentation and/or other materials provided with the distribution.
|
|
+3. The name of the author may not be used to endorse or promote products
|
|
+ derived from this software without specific prior written permission.
|
|
+
|
|
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
--- OpenSceneGraph-3.4.0/CMakeModules/MacroOptionalFindPackage.cmake
|
|
+++ OpenSceneGraph-3.4.0/CMakeModules/MacroOptionalFindPackage.cmake
|
|
@@ -0,0 +1,28 @@
|
|
+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
|
|
+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
|
|
+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
|
|
+# works like FIND_PACKAGE(), but additionally it automatically creates
|
|
+# an option name WITH_<name>, which can be disabled via the cmake GUI.
|
|
+# or via -DWITH_<name>=OFF
|
|
+# The standard <name>_FOUND variables can be used in the same way
|
|
+# as when using the normal FIND_PACKAGE()
|
|
+
|
|
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
|
|
+#
|
|
+# Redistribution and use is allowed according to the terms of the BSD license.
|
|
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
+
|
|
+
|
|
+macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
|
|
+ option(WITH_${_name} "Search for ${_name} package" ON)
|
|
+ if (WITH_${_name})
|
|
+ find_package(${_name} ${ARGN})
|
|
+ else (WITH_${_name})
|
|
+ set(${_name}_FOUND)
|
|
+ set(${_name}_INCLUDE_DIR)
|
|
+ set(${_name}_INCLUDES)
|
|
+ set(${_name}_LIBRARY)
|
|
+ set(${_name}_LIBRARIES)
|
|
+ endif (WITH_${_name})
|
|
+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
|
|
+
|
|
--- OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake
|
|
+++ OpenSceneGraph-3.5.5/CMakeModules/OsgMacroUtils.cmake
|
|
@@ -463,7 +463,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 )
|
|
IF(MSVC)
|
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo)
|
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug)
|
|
|
|
--- OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt
|
|
+++ OpenSceneGraph-3.4.0/examples/osgviewerFLTK/CMakeLists.txt
|
|
@@ -1,6 +1,6 @@
|
|
SET(TARGET_SRC osgviewerFLTK.cpp )
|
|
|
|
-SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
|
|
+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
|
|
|
|
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
|
|
|