FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2cc53e2256
OpenSceneGraph/CMakeLists.txt

768 lines
33 KiB
CMake
Raw Normal View History

Added different cmake version requirements across platforms
2007-04-12 18:14:10 +08:00
IF(WIN32)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
ELSE(WIN32)
IF(APPLE)
From Eric Sokolowski, added enforcement of CMake 2.6.0 under OSX.
2008-06-26 21:09:54 +08:00
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
From Eric Wing, "I made a mistake in my IF() checks for FOO_CONFIG_HAS_BEEN_RUN_BEFORE. I was using ${FOO_CONFIG_HAS_BEEN_RUN_BEFORE} instead of just FOO_HAS_BEEN_RUN_BEFORE. In this case, it happened to work out to still be correct, but in general it shouldn't have the ${}. (I really hate this syntax.)"
2007-04-25 17:14:01 +08:00
IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
MESSAGE("Warning: A critical CMake bug exists in 2.4.6 and below. Trying to build Universal Binaries will result in a compile error that seems unrelated. Either avoid building Universal Binaries by changing the CMAKE_OSX_ARCHITECTURES field to list only your architecture, or upgrade to the current CVS version of CMake or a newer stable version if it exists.")
ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
Added different cmake version requirements across platforms
2007-04-12 18:14:10 +08:00
ELSE(APPLE)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0 FATAL_ERROR)
ENDIF(APPLE)
ENDIF(WIN32)
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
if(COMMAND cmake_policy)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# Works around warnings libraries linked against that don't
# have absolute paths (e.g. -lpthreads)
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
cmake_policy(SET CMP0003 NEW)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# Works around warnings about escaped quotes in ADD_DEFINITIONS
# statements.
From Eric Sokolowsky, "I have made a number of changes intended to get a few things working better on OSX. However, since I'm still pretty new at Mac development and cmake I'm not entirely certain that the changes I have made are benign on other platforms. I have tested these changes on Leopard with CMake 2.6 generating Xcode 3.0 projects, compiling on ppc and i386 for 10.5 and 10.4, and on Linux (CentOS) and everything still seems to work ok. Here are the changes I made (against OSG svn as of this afternoon): - Added osgviewerCocoa example to APPLE builds - Fixed corrupt Xcode project generation with CMake 2.6 dealing with ADD_DEFINITIONS and CMake Policy CMP0005 on Leopard - Resolved CMP0006 warning for examples and programs by setting BUNDLE DESTINATION to same as RUNTIME DESTINATION with CMake 2.6 - Fixed freetype plugin on Leopard to avoid OpenGL linking problem - Figured out how to use a custom Info.plist included in the project (see osgviewerCocoa application CMakeLists.txt)"
2008-06-23 17:57:45 +08:00
cmake_policy(SET CMP0005 NEW)
From Mattias Helsing, CMakeLists.txt changes: "I installed latest Cmake(2.6.1) on a new machine and got a CMP008 warning from cmake. This fix set up osg to use the old behaviour which have worked before. We might set this to NEW but I need to do more testing first. I'l be able to test this on winxp with msvc80/90 and ubuntu hardy with gcc-4.2. quote from cmake cvs log policy CMP0008 to decides how to treat full path libraries that do not appear to be valid library file names. Such libraries worked by accident in the VS IDE and Xcode generators with CMake 2.4 and below." OsgMarcroUtils.cmake changes: "On Philips suggestion truncated a redundant if/else construction in OsgMacroUtils to avoid developer warnings in cmake-2.6.1 concerning cmake policy CMP0008 which allows full paths to libraries only with valid library names "
2008-09-18 03:25:40 +08:00
# cmake-2.6.1 introduces policy cmp0008 decide how to treat full path libraries that do not appear to be valid library file names
# quote from cvslog "Such libraries worked by accident in the VS IDE and Xcode generators in CMake 2.4 and below."
if(POLICY CMP0008)
cmake_policy(SET CMP0008 OLD)
endif(POLICY CMP0008)
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
endif(COMMAND cmake_policy)
Ran dos2unix
2007-03-09 17:07:05 +08:00
PROJECT(OpenSceneGraph)
Updated version numbers for 2.0 release
2007-06-15 18:15:54 +08:00
SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
Updated version numbers in prep for next dev release
2008-08-16 01:26:06 +08:00
SET(OPENSCENEGRAPH_MINOR_VERSION 7)
Updated version numbers for 2.8.8 dev release
2008-12-17 00:36:33 +08:00
SET(OPENSCENEGRAPH_PATCH_VERSION 8)
SET(OPENSCENEGRAPH_SOVERSION 53)
From Eric Wing, " Here are more changes for the CMake scripts: - I removed CMAKE_INSTALL_PREFIX in FindOpenThreads as a follow up to the discussion thread. - I introduced an experimental CMAKE_PREFIX_PATH to replace it. - I added CMAKE_PREFIX_PATH, CMAKE_INCLUDE_PATH, and CMAKE_LIBRARY_PATH to the CMake GUI so users can enter values there instead of in the environment. - I added OPENSCENEGRAPH_*_VERSION variables (MAJOR, MINOR, PATCH). These should be kept up-to-date with the real version numbers. Mac bundles like to have version information so users can find out the version they are running through standard About panels and also automated system reporters for troubleshooting/bug tracking. In theory, this information could be used for library versioning. We should do the same for OpenThreads, but I forgot about it. - I added some Mac Info.plist stuff (which uses the version information). "
2007-04-27 18:29:48 +08:00
Introduced a OSG_MAINTAINER section of cmake build to help support making tags and branches
2008-09-01 23:27:35 +08:00
# set to 0 when not a release candidate, non zero means that any generated
# svn tags will be treated as release candidates of given number
SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
Introduced VERSION and SOVERSION'ing of libraries.
2007-05-21 01:38:11 +08:00
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})
Introduced a OSG_PLUGIN_PREFIX variable into CMake build system with it set to "" for all platforms except Cygwin where its set to "cygwin_" and Mingw where it is set to "mingw_". Updated osgDB::Registry to look for these for the plugins. Updated the osgintrospection example to search for these names as well.
2007-10-03 05:26:22 +08:00
SET(OSG_PLUGIN_PREFIX "")
IF (CYGWIN)
SET(OSG_PLUGIN_PREFIX "cygwin_")
ENDIF(CYGWIN)
IF(MINGW)
SET(OSG_PLUGIN_PREFIX "mingw_")
ENDIF(MINGW)
Introduced VERSION and SOVERSION'ing of libraries.
2007-05-21 01:38:11 +08:00
# We want to build SONAMES shared librariess
SET(OPENSCENEGRAPH_SONAMES TRUE)
SET(OPENTHREADS_SONAMES TRUE)
Added support for version of the osgPlugins directory, which now gets versioned according to the OpenSceneGraph/CMakeLists.txt and the include/osg/Version settings. These changes mean that the 1.9.5 release will have a libs/osgPlugins-1.9.5 directory.
2007-05-20 20:29:11 +08:00
Added support for setting OpenThreads_SOURCE_DIR to help the install of OpenThreads headers
2007-05-03 16:50:06 +08:00
SET(OpenThreads_SOURCE_DIR ${OpenSceneGraph_SOURCE_DIR})
Ran dos2unix
2007-03-09 17:07:05 +08:00
# We have some custom .cmake scripts not in the official distribution.
# Maybe this can be used override existing behavior if needed?
SET(CMAKE_MODULE_PATH "${OpenSceneGraph_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
# Okay, here's the problem: On some platforms, linking against OpenThreads
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# is not enough and explicit linking to the underlying thread library
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
# is also required (e.g. FreeBSD). But OpenThreads may be built with different
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# backends (Pthreads, Sproc, Windows) so we don't know what the underlying
# thread library is because some platforms support multiple backends (e.g.
# IRIX supports Sproc and Pthreads). Linking all libraries won't work
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
# because the libraries may be incompatible.
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# So the current solution is to attempt best guess linking and exempt certain
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
# cases. With IRIX, we're going to hope explicit linking to the underlying
# library is not necessary. We currently don't case for pthreads on Windows
# which might be an issue on things like Cygwin. This may need to be fixed.
FIND_PACKAGE(Threads)
IF(CMAKE_SYSTEM MATCHES IRIX)
Removed tabs
2007-04-11 16:33:40 +08:00
# Erase CMAKE_THREAD_LIBS_INIT and hope it works
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
ENDIF(CMAKE_SYSTEM MATCHES IRIX)
Introduced a OSG_MAINTAINER section of cmake build to help support making tags and branches
2008-09-01 23:27:35 +08:00
OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
IF (OSG_MAINTAINER)
SET(OPENSCENEGRAPH_SVN "trunk")
#SET(OPENSCENEGRAPH_SVN "branches")
SET(OPENSCENEGRAPH_BRANCH OpenSceneGraph-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION})
#
# Provide target for tagging a release
#
SET(SVNCOMMAND svn)
SET(SVNTRUNKDIR http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk)
SET(SVNTAGDIR http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags)
SET(SVNBRANCHDIR http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branch)
IF (OPENSCENEGRAPH_SVN STREQUAL "trunk")
SET(SVNSOURCEDIR ${SVNTRUNKDIR})
ELSE (OPENSCENEGRAPH_SVN STREQUAL "trunk")
SET(SVNSOURCEDIR ${SVNBRANCH_DIR}/${OPENSCENEGRAPH_BRANCH})
ENDIF(OPENSCENEGRAPH_SVN STREQUAL "trunk")
IF (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION})
ELSE (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION}-rc${OPENSCENEGRAPH_RELEASE_CANDIDATE})
ENDIF(OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
ADD_CUSTOM_TARGET(tag-test
COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
)
ADD_CUSTOM_TARGET(tag-run
COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
)
ADD_CUSTOM_TARGET(branch-test
COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
)
ADD_CUSTOM_TARGET(branch-run
COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
)
#
# Provide target for generating ChangeLog
#
Where possible moved redundent C header includes from headers to source files
2008-12-13 02:47:30 +08:00
SET(GENERATELOGS svn2cl)
Introduced a OSG_MAINTAINER section of cmake build to help support making tags and branches
2008-09-01 23:27:35 +08:00
ADD_CUSTOM_TARGET(ChangeLog
Added an svn update into the make ChangeLog entry.
2008-09-12 00:06:37 +08:00
COMMAND ${SVNCOMMAND} update
Introduced a OSG_MAINTAINER section of cmake build to help support making tags and branches
2008-09-01 23:27:35 +08:00
COMMAND ${GENERATELOGS}
)
ENDIF(OSG_MAINTAINER)
From Philip Lowman, added support for Inventor
2007-03-20 17:50:24 +08:00
# Find OpenGL
Ran dos2unix
2007-03-09 17:07:05 +08:00
FIND_PACKAGE(OpenGL)
IF(APPLE)
Removed tabs
2007-04-11 16:33:40 +08:00
FIND_LIBRARY(CARBON_LIBRARY Carbon)
FIND_LIBRARY(COCOA_LIBRARY Cocoa)
Ran dos2unix
2007-03-09 17:07:05 +08:00
ENDIF(APPLE)
IF(UNIX)
Removed tabs
2007-04-11 16:33:40 +08:00
# Not sure what this will do on Cygwin and Msys
# Also, remember OS X X11 is a user installed option so it may not exist.
FIND_PACKAGE(X11)
# Some Unicies need explicit linkage to the Math library or the build fails.
FIND_LIBRARY(MATH_LIBRARY m)
Ran dos2unix
2007-03-09 17:07:05 +08:00
ENDIF(UNIX)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
Ran dos2unix
2007-03-09 17:07:05 +08:00
# Make the headers visible to everything
From Mathias Froehlich, made the include of bin directory for include/OpenThreads/Config only used when doing out of source builds
2008-06-20 19:16:06 +08:00
IF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)
ENDIF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
Ran dos2unix
2007-03-09 17:07:05 +08:00
INCLUDE_DIRECTORIES(
Removed tabs
2007-04-11 16:33:40 +08:00
${OpenSceneGraph_SOURCE_DIR}/include
${OPENGL_INCLUDE_DIR}
Ran dos2unix
2007-03-09 17:07:05 +08:00
)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
Ran dos2unix
2007-03-09 17:07:05 +08:00
# Common global definitions
#ADD_DEFINITIONS(-D)
# Platform specific definitions
Introduced a OSG_PLUGIN_PREFIX variable into CMake build system with it set to "" for all platforms except Cygwin where its set to "cygwin_" and Mingw where it is set to "mingw_". Updated osgDB::Registry to look for these for the plugins. Updated the osgintrospection example to search for these names as well.
2007-10-03 05:26:22 +08:00
Ran dos2unix
2007-03-09 17:07:05 +08:00
IF(WIN32)
From Sherman Wilcox, "Here is a patch for cmakelists.txt to add support for the /MP option in Microsoft compilers as discussed in osg-users. There is now an advanced option called WIN32_USE_MP (which defaults to OFF) that will enable the /MP switch for all builds. I tucked this code block safely within a IF(WIN32) branch."
2008-04-11 21:03:02 +08:00
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
IF(MSVC)
# This option is to enable the /MP switch for Visual Studio 2005 and above compilers
OPTION(WIN32_USE_MP "Set to ON to build OpenSceneGraph with the /MP option (Visual Studio 2005 and above)." OFF)
MARK_AS_ADVANCED(WIN32_USE_MP)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
IF(WIN32_USE_MP)
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
ENDIF(WIN32_USE_MP)
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
From Simon Hammett, moved VS #prgama warning disabling from include/osg/Export to CMakeList.txt.
2008-11-15 02:22:01 +08:00
# turn off various warnings
foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd${warning}")
endforeach(warning)
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
# More MSVC specific compilation flags
ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
ENDIF(MSVC)
From Sherman Wilcox, "Here is a patch for cmakelists.txt to add support for the /MP option in Microsoft compilers as discussed in osg-users. There is now an advanced option called WIN32_USE_MP (which defaults to OFF) that will enable the /MP switch for all builds. I tucked this code block safely within a IF(WIN32) branch."
2008-04-11 21:03:02 +08:00
Removed tabs
2007-04-11 16:33:40 +08:00
#needed for net plugin
Changed the search for Qt version to prevent problems when having both Qt3 and Qt4 installed on one machine.
2007-10-03 04:56:56 +08:00
SET (OSG_SOCKET_LIBS wsock32)
Removed tabs
2007-04-11 16:33:40 +08:00
# Both Cygwin and Msys need -DNOMINMAX ???
IF(UNIX)
ADD_DEFINITIONS(-DNOMINMAX)
ENDIF(UNIX)
From Luigi Calori, introduction of versioning of dll's and placement of dll and plugins into bin directory during build.
2007-08-30 18:41:15 +08:00
########################################################################################################
# the foolowing options are MSVC specific,
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# the first OSG_MSVC_VERSIONED_DLL activate a custom build-time layout that should allow to run examples and application
From Luigi Calori, introduction of versioning of dll's and placement of dll and plugins into bin directory during build.
2007-08-30 18:41:15 +08:00
# fron bin folder without requiring installation step.
# it also prepend "osg${OPENSCENEGRAPH_SOVERSION}-" to only .dll files, leaving .lib files untouched in lib
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# it also use a hack to get rid of Debug and Release folder in MSVC projects
From Luigi Calori, introduction of versioning of dll's and placement of dll and plugins into bin directory during build.
2007-08-30 18:41:15 +08:00
# all the .dll and .pdb are in bin and all the .lib and .exp are in lib
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
#
From Luigi Calori, introduction of versioning of dll's and placement of dll and plugins into bin directory during build.
2007-08-30 18:41:15 +08:00
# the second option disable incremental linking in debug build , that is enabled by default by CMake
##########################################################################################################
Maded versioning under Windows the default.
2007-09-11 00:06:23 +08:00
IF(MSVC)
IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
MESSAGE("Warning: disabling versioned options 2.4.6 exibits inconsintencies in .pdb naming, at least under MSVC, suggested upgrading at least to 2.4.7")
SET(OSG_MSVC_VERSIONED_DLL OFF)
SET(OSG_MSVC_DEBUG_INCREMENTAL_LINK ON)
ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
OPTION(OSG_MSVC_VERSIONED_DLL "Set to ON to build OpenSceneGraph with versioned dll names" ON)
MARK_AS_ADVANCED(OSG_MSVC_VERSIONED_DLL)
OPTION(OSG_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build OpenSceneGraph without incremental linking in debug (release is off by default)" ON)
MARK_AS_ADVANCED(OSG_MSVC_DEBUG_INCREMENTAL_LINK)
IF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
ENDIF(MSVC)
Ran dos2unix
2007-03-09 17:07:05 +08:00
ENDIF(WIN32)
From Luigi Calori, "Here are some fix for building plugin net and installing .lib under lib under WIndows + some setting (commented) coming from previous build setup"
2007-03-10 00:25:11 +08:00
########################################################################################################
##### these were settings located in SetupCommon.cmake used in Luigi builds.... find out what are useful
########################################################################################################
#luigi#SET(CMAKE_VERBOSE_MAKEFILE TRUE)
#luigi#SET(CMAKE_SKIP_RPATH TRUE)
#luigi#SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
#luigi#IF(UNIX)
Removed tabs
2007-04-11 16:33:40 +08:00
#luigi# LIST_CONTAINS(contains "g++" ${CMAKE_CXX_COMPILER_LIST})
#luigi# IF (contains)
#luigi# MESSAGE(${MY_MESSAGE_DEFAULT} "${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} setting CMAKE_CXX_COMPILER to g++")
#luigi# SET(CMAKE_CXX_COMPILER "g++")
#luigi# SET(CMAKE_CXX_COMPILER_LOADED 2)
#luigi# SET(CMAKE_CXX_COMPILER_WORKS 2)
#luigi# ENDIF (contains)
#luigi# SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
#luigi# SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb -gstabs")
From Luigi Calori, "Here are some fix for building plugin net and installing .lib under lib under WIndows + some setting (commented) coming from previous build setup"
2007-03-10 00:25:11 +08:00
#luigi#ENDIF(UNIX)
########################################################################################################
Introduced CMake build option for compiling double or float versions of osg::BoundingSphere and osg::BoundingBox. Introduced code in BoundgingSphere, BoundingBox, ProxyNode and LOD to utilise the above settings. Added Matrix::value_type, Plane::value_type, BoundingSphere::value_type and BoundingBox::value_type command line options that report where the types of floats or doubles.
2008-04-04 02:36:50 +08:00
OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF)
Added support for SG_USE_FLOAT_MATRIX and OSG_USE_FLOAT_PLANE in CMake build and include/osg/Matrix and include/osg/Plane.
2007-05-20 19:45:09 +08:00
MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)
Introduced CMake build option for compiling double or float versions of osg::BoundingSphere and osg::BoundingBox. Introduced code in BoundgingSphere, BoundingBox, ProxyNode and LOD to utilise the above settings. Added Matrix::value_type, Plane::value_type, BoundingSphere::value_type and BoundingBox::value_type command line options that report where the types of floats or doubles.
2008-04-04 02:36:50 +08:00
OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float Plane instead of double." OFF)
Added support for SG_USE_FLOAT_MATRIX and OSG_USE_FLOAT_PLANE in CMake build and include/osg/Matrix and include/osg/Plane.
2007-05-20 19:45:09 +08:00
MARK_AS_ADVANCED(OSG_USE_FLOAT_PLANE)
Ran dos2unix
2007-03-09 17:07:05 +08:00
Introduced CMake build option for compiling double or float versions of osg::BoundingSphere and osg::BoundingBox. Introduced code in BoundgingSphere, BoundingBox, ProxyNode and LOD to utilise the above settings. Added Matrix::value_type, Plane::value_type, BoundingSphere::value_type and BoundingBox::value_type command line options that report where the types of floats or doubles.
2008-04-04 02:36:50 +08:00
OPTION(OSG_USE_FLOAT_BOUNDINGSPHERE "Set to ON to build OpenSceneGraph with float BoundingSphere instead of double." ON)
MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON)
MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX)
Ran dos2unix
2007-03-09 17:07:05 +08:00
From Michael Platings, Converted std::fstream/ifstream/ofstream to osgDB::fstream/ifstream/ofstream and fopen to osgDB::fopen to facilitate support for wide character filenames using UT8 encoding.
2008-11-07 23:08:08 +08:00
OPTION(OSG_USE_UTF8_FILENAME "Set to ON to use a UTF8 locale for filenames instead of the default locale." OFF)
MARK_AS_ADVANCED(OSG_USE_UTF8_FILENAME)
From Wojciech Lewandowski, "I have restored MSVC disabled warnings in osg/Export. Difference is they are now disabled only when OSG_DISABLE_MSVC_WARNINGS macro is defined. This macro is set through CMake options and autogenerated in osg/Config. Simon suggested that it would be cool if we had more control over selected warnings. I tried to learn how to make selection of individual warning numbers possible, but had to gave up as my cmake skills were not sufficient. The only way I saw this possible would be adding one define for each MSVC warning number. But many definitions seemed too be to much clutter for osg/Config file so I rejected thar idea. For this it would be cool if autogenerated Config entries could more powerful than simple #define/#undef flags. Maybe Cmake gurus know how to do it. I have not reverted added Compiler options. I assume that one may want to have warnings enabled for the application but may not want to see them while OSG libraries and examples compile. Modified files: osg/Export - now explicitly includes osg/Config to make sure OSG_DISABLE_MSVC_WARNINGS is read osg/Config.in - declares OSG_DISABLE_MSVC_WARNINGS flag to be added to autogenerated osg/Config CMakeLists.txt - declares OSG_DISABLE_MSVC_WARNINGS as option with default ON setting "
2008-11-25 00:32:52 +08:00
OPTION(OSG_DISABLE_MSVC_WARNINGS "Set to OFF to not disable MSVC wartnings genertated by OSG headers." ON)
MARK_AS_ADVANCED(OSG_DISABLE_MSVC_WARNINGS)
Moved the OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION definition into the Config.in rather use of -D define
2008-10-03 23:36:34 +08:00
OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON)
Changed the include/osg/Config and include/OpenThreads/Config references to use the assocaited CMake variable for these headers
2008-06-21 03:52:14 +08:00
################################################################################
# Set Config file
SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config")
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in"
"${OPENSCENEGRAPH_CONFIG_HEADER}")
Commented out the explict install of the Config files as including these files into the header list allows the normal Cmake install support to install them.
2008-06-23 18:18:04 +08:00
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
Changed the include/osg/Config and include/OpenThreads/Config references to use the assocaited CMake variable for these headers
2008-06-21 03:52:14 +08:00
Ran dos2unix
2007-03-09 17:07:05 +08:00
################################################################################
# 3rd Party Dependency Stuff
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
IF(WIN32)
Removed tabs
2007-04-11 16:33:40 +08:00
INCLUDE(Find3rdPartyDependencies)
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
ENDIF(WIN32)
Ran dos2unix
2007-03-09 17:07:05 +08:00
# Common to all platforms:
FIND_PACKAGE(FreeType)
Added CMake QT3, FLTK and osgintrospection example build support.
2007-03-22 22:44:05 +08:00
FIND_PACKAGE(FLTK)
From Eric Wing, added ${MATH_LIB} to osg CMakeLists.txt and definition of this to m under unix
2007-03-22 21:38:23 +08:00
FIND_PACKAGE(GLUT)
FIND_PACKAGE(SDL)
From Alexandre Amalric, Fox example From Robert Osfield, CMake build support for FOX example
2007-07-24 22:02:53 +08:00
FIND_PACKAGE(FOX)
From Philip Lowman, added support for Inventor
2007-03-20 17:50:24 +08:00
FIND_PACKAGE(Inventor)
Added support for jp2 plugin
2007-05-04 21:20:48 +08:00
FIND_PACKAGE(Jasper)
Added searching for OpenEXR
2008-11-26 20:35:49 +08:00
FIND_PACKAGE(OpenEXR)
Added first cut of Cmake COLLADA support
2007-05-04 22:25:02 +08:00
FIND_PACKAGE(COLLADA)
Added first cut a Xine support
2007-05-05 03:17:49 +08:00
FIND_PACKAGE(Xine)
Added OpenVRML support
2007-05-06 00:11:30 +08:00
FIND_PACKAGE(OpenVRML)
Added preliminary Performer plugin support, note, still missing are a range of Performer database libs that will be required.
2007-05-06 00:24:07 +08:00
FIND_PACKAGE(Performer)
From Ulrich Hertlein, "on my MacOS X/cmake setup the zlib plugin isn't built by default. This may be because zlib.h is installed in /opt/local/include on my system (courtesy of DarwinPorts). I've added a CMakeModule to look for zlib.h and the library in various places. The files are attached."
2007-06-06 23:22:31 +08:00
FIND_PACKAGE(ZLIB)
Re-introduced GDAL plugin.
2007-08-07 18:33:25 +08:00
FIND_PACKAGE(GDAL)
Added initial cut of libcurl based plugin
2008-03-21 21:08:02 +08:00
FIND_PACKAGE(CURL)
Initial cut of zlib based compress/uncompress plugin
2008-10-10 01:02:16 +08:00
FIND_PACKAGE(ZLIB)
Introduced initial cut of a dicom loader, which uses ITK to do the loading.
2008-08-23 00:39:17 +08:00
FIND_PACKAGE(ITK)
Added very basic osgvnc example that uses the LibVNCServer client libries for implementing a vnc client as an osg::Image with the vnc data stream going to it.
2008-10-31 20:03:44 +08:00
FIND_PACKAGE(LibVNCServer)
Added optional usage of DCMTK in the dicom plugin
2008-09-16 03:59:12 +08:00
FIND_PACKAGE(OurDCMTK)
Changed osgbrowser example to use a local CMakeModules/FindXUL.cmake script, and specialization of GTK dependencies to only non Windows/OSX platforms.
2008-11-19 07:38:18 +08:00
FIND_PACKAGE(XUL)
Ran dos2unix
2007-03-09 17:07:05 +08:00
Fixed CMake support for osgsimpleviewWX
2007-05-11 20:46:38 +08:00
SET(wxWidgets_USE_LIBS base core gl net)
FIND_PACKAGE(wxWidgets)
Changed the search for Qt version to prevent problems when having both Qt3 and Qt4 installed on one machine.
2007-10-03 04:56:56 +08:00
# To select a specific version of QT define DESIRED_QT_VERSION
# via cmake -DDESIRED_QT_VERSION=4
IF (DESIRED_QT_VERSION)
IF (DESIRED_QT_VERSION MATCHES 4)
FIND_PACKAGE(Qt4)
ELSE(DESIRED_QT_VERSION MATCHES 4)
FIND_PACKAGE(Qt3)
ENDIF(DESIRED_QT_VERSION MATCHES 4)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
Changed the search for Qt version to prevent problems when having both Qt3 and Qt4 installed on one machine.
2007-10-03 04:56:56 +08:00
ELSE(DESIRED_QT_VERSION)
FIND_PACKAGE(Qt4)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
Changed the search for Qt version to prevent problems when having both Qt3 and Qt4 installed on one machine.
2007-10-03 04:56:56 +08:00
IF (NOT QT4_FOUND)
FIND_PACKAGE(Qt3)
ENDIF(NOT QT4_FOUND)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
Changed the search for Qt version to prevent problems when having both Qt3 and Qt4 installed on one machine.
2007-10-03 04:56:56 +08:00
ENDIF(DESIRED_QT_VERSION)
Added check for pkg-config so that build only use related package checks when it's supported
2008-05-25 19:21:40 +08:00
#use pkg-config to find various modues
Changed FIND_PACKAGE(PkgConfig) to INCLUDE(FindPkgConfig OPTIONAL) as per suggestion from Philip Lowman.
2008-05-31 16:47:15 +08:00
INCLUDE(FindPkgConfig OPTIONAL)
Added check for pkg-config so that build only use related package checks when it's supported
2008-05-25 19:21:40 +08:00
IF(PKG_CONFIG_FOUND)
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(GTK gtk+-2.0)
IF(WIN32)
PKG_CHECK_MODULES(GTKGL gtkglext-win32-1.0)
ELSE(WIN32)
PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
ENDIF(WIN32)
PKG_CHECK_MODULES(RSVG librsvg-2.0)
PKG_CHECK_MODULES(CAIRO cairo)
Moved Poppler-glib check into root CMakeList.txt
2008-11-13 06:54:12 +08:00
PKG_CHECK_MODULES(POPPLER poppler-glib)
Added check for pkg-config so that build only use related package checks when it's supported
2008-05-25 19:21:40 +08:00
ENDIF(PKG_CONFIG_FOUND)
Added optional compile of the new ref_ptr<>:T* operator() output conversion operator, controlled via a CMake option OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION.
2008-10-03 23:15:04 +08:00
From Philip Lowman, "If you change CMAKE_INSTALL_PREFIX in the cache editor after building the OSG, it causes the entire project to rebuild (at least with the CMake makefile generator due to changing preprocessor definitions applied across all targets). I suggest moving the definition of OSG_DEFAULT_LIBRARY_PATH (which is responsible for this global rebuild) into osgDB/CMakeLists.txt which is the only library in the code where this definition is (and is likely ever to be) used. This way if the user changes it, only osgDB will rebuild."
2008-11-15 04:50:40 +08:00
From Philip Lowman, "Attached is a patch to the toplevel CMakeLists.txt which adds an automated test for OSG_GLU_TESS_CALLBACK_TRIPLEDOT. This should help ease initial configuration on OS X systems."
2008-05-08 20:55:01 +08:00
#
# Test to determine if we want the "tripledot" form of the GLU tesselator callback.
#
IF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
From Philip Lowman, "I changed the test name to be a little easier to understand and defaulted Linux & Windows builds to false and to skip the compile check as you desired. "
2008-05-27 05:18:41 +08:00
IF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
# Skip the compile check for platforms that never need the variable
# form.
SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT false)
ELSE(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
# For other platforms perform the check
INCLUDE(CheckCXXSourceCompiles)
SET(CMAKE_REQUIRED_DEFINITIONS -DGLU_TESS_CALLBACK_TRIPLEDOT)
SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR} ${GL_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${GLUT_LIBRARY} ${GL_LIBRARY})
CHECK_CXX_SOURCE_COMPILES(
"#include <osg/GL>
#include <osg/GLU>
static void testcb(GLvoid *, void*) { }
int main() {
GLUtesselator *t = gluNewTess();
gluTessCallback(t, GLU_TESS_VERTEX_DATA, (GLU_TESS_CALLBACK) testcb);
return 0;
}"
GLU_Tesselator_Needs_Variable_Parameter_Callback_Convention_Failure_Means_No)
SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT
${GLU_Tesselator_Needs_Variable_Parameter_Callback_Convention_Failure_Means_No})
ENDIF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
From Philip Lowman, "Attached is a patch to the toplevel CMakeLists.txt which adds an automated test for OSG_GLU_TESS_CALLBACK_TRIPLEDOT. This should help ease initial configuration on OS X systems."
2008-05-08 20:55:01 +08:00
ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
Changed the search for Qt version to prevent problems when having both Qt3 and Qt4 installed on one machine.
2007-10-03 04:56:56 +08:00
Updated version number for 2.7.1 release, and added OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL Cmake option that enables the occlusion query workaround for an OpenGL driver crash
2008-08-26 00:44:48 +08:00
OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build with variable parameter (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
From Philip Lowman, "Attached is a patch to the toplevel CMakeLists.txt which adds an automated test for OSG_GLU_TESS_CALLBACK_TRIPLEDOT. This should help ease initial configuration on OS X systems."
2008-05-08 20:55:01 +08:00
IF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
Changed the search for Qt version to prevent problems when having both Qt3 and Qt4 installed on one machine.
2007-10-03 04:56:56 +08:00
Ran dos2unix
2007-03-09 17:07:05 +08:00
# Platform specific:
# (We can approach this one of two ways. We can try to FIND everything
# and simply check if we found the packages before actually building
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# or we can hardcode the cases. The advantage of the former is that
Ran dos2unix
2007-03-09 17:07:05 +08:00
# packages that are installed on platforms that don't require them
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# will still get built (presuming no compatibility issues). But this
# also means modules that are redundant may get built. For example,
Ran dos2unix
2007-03-09 17:07:05 +08:00
# OS X doesn't need GIF, JPEG, PNG, TIFF, etc because it uses QuickTime.
# Also, it will clutter the CMake menu with "NOT_FOUND".
# The downside to the latter is that it is harder to build those
# potentially redundant modules.)
# Image readers/writers depend on 3rd party libraries except for OS X which
# can use Quicktime.
IF(NOT APPLE)
Removed tabs
2007-04-11 16:33:40 +08:00
FIND_PACKAGE(GIFLIB)
FIND_PACKAGE(JPEG)
FIND_PACKAGE(PNG)
FIND_PACKAGE(TIFF)
# QuickTime is required for OS X, but optional for Windows.
IF(WIN32)
FIND_PACKAGE(QuickTime)
ENDIF(WIN32)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
ELSE(NOT APPLE)
Removed tabs
2007-04-11 16:33:40 +08:00
FIND_PACKAGE(QuickTime)
Ran dos2unix
2007-03-09 17:07:05 +08:00
ENDIF(NOT APPLE)
Added automatic creation of lib bin and lib/osgPlugins
2007-03-23 16:53:06 +08:00
################################################################################
# Create bin and lib directories if required
IF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
Added support for version of the osgPlugins directory, which now gets versioned according to the OpenSceneGraph/CMakeLists.txt and the include/osg/Version settings. These changes mean that the 1.9.5 release will have a libs/osgPlugins-1.9.5 directory.
2007-05-20 20:29:11 +08:00
FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/lib/${OSG_PLUGINS})
Added automatic creation of lib bin and lib/osgPlugins
2007-03-23 16:53:06 +08:00
ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
Ran dos2unix
2007-03-09 17:07:05 +08:00
################################################################################
# Installation stuff
From Cedric Pinson, "By default it's the normal behaviour, it means it's "d" extension for debug library and executable. But if you want to change that you can. The reason is if you want to build an application that use a library that use openscenegraph you have to build the full chain in debug or in release. On windows you have no choice, but on linux you can link with both version without rebuilding everything ... The patch consist only to change the line on one line SET(CMAKE_DEBUG_POSTFIX "d") with SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows")"
2008-05-28 01:42:56 +08:00
SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows")
Changed OSG_DEBUG_POSTFIX to use ADDQUOTES in the .cpp rather than trying to add quotes via CMakeLists.txt
2008-09-22 22:58:35 +08:00
ADD_DEFINITIONS(-DOSG_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX})
From Bob Kuehne, "minor tweak to the cmake root file to handle debug correctly on os x."
2008-12-19 01:09:12 +08:00
IF(UNIX AND NOT WIN32)
From Mathieu Marache, first post: "I had the problem that debug and release version of the plugins had the same name under linux. These minors modification to Registry and the CMake support files enable to have both Release and Debug version of the plugins to coexist and be found by there respective runtimes." follow up post: "I've gone ahead and added a preprocessor directive with the editable CMAKE_DEBUG_POSTFIX. I modified Registry.cpp to take this new preprocessor directive called OSG_DEBUG_POSTFIX while looking for libraries in Debug mode for the windows (msvc) and the linux platforms. MinGW, cygwin and Apple are still left out this proposal." Notes from Robert Osfield, completed the work in change d entries to use OSG_DEBUG_POSTFIX
2008-05-28 20:49:47 +08:00
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
ADD_DEFINITIONS("-D_DEBUG")
ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
From Bob Kuehne, "minor tweak to the cmake root file to handle debug correctly on os x."
2008-12-19 01:09:12 +08:00
ENDIF(UNIX AND NOT WIN32)
From Mathieu Marache, first post: "I had the problem that debug and release version of the plugins had the same name under linux. These minors modification to Registry and the CMake support files enable to have both Release and Debug version of the plugins to coexist and be found by there respective runtimes." follow up post: "I've gone ahead and added a preprocessor directive with the editable CMAKE_DEBUG_POSTFIX. I modified Registry.cpp to take this new preprocessor directive called OSG_DEBUG_POSTFIX while looking for libraries in Debug mode for the windows (msvc) and the linux platforms. MinGW, cygwin and Apple are still left out this proposal." Notes from Robert Osfield, completed the work in change d entries to use OSG_DEBUG_POSTFIX
2008-05-28 20:49:47 +08:00
From Alberto Luaces, "Cygwin's cmake build adds a "d" postfix to the plugins installed in debug mode. Nevertheless, the code doesn't acknowledge that, so I had problems with debug versions of the library not being able to open their plugins whereas the release versions worked fine. I have made the same changes in Registry.cpp that are available for the rest of platforms appending that "d" to their plugins. I have also updated the CMakeLists.txt file to get "_DEBUG" defined at compilation time. I have copied the already existent conditional block because of cmake's bizarre operator precedence. Since Cygwin defines both CYGWIN and WIN32, the following would suffice: IF(CYGWIN OR UNIX AND NOT WIN32 AND NOT APPLE) Sadly, it actually doesn't work, so I wrote a new conditional block just for Cygwin. I could join the two blocks when the parentheses support is added in newer versions of cmake."
2008-09-18 02:56:59 +08:00
IF(CYGWIN)
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
ADD_DEFINITIONS("-D_DEBUG")
ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
ENDIF(CYGWIN)
Ran dos2unix
2007-03-09 17:07:05 +08:00
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
IF(UNIX AND NOT WIN32 AND NOT APPLE)
IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
From Lugi Calori, added control of lib postfix.
2007-05-20 17:55:34 +08:00
SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
MARK_AS_ADVANCED(LIB_POSTFIX)
From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT
2007-03-29 18:56:07 +08:00
ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
From Lugi Calori, added control of lib postfix.
2007-05-20 17:55:34 +08:00
IF(NOT DEFINED LIB_POSTFIX)
SET(LIB_POSTFIX "")
ENDIF(NOT DEFINED LIB_POSTFIX)
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
# Here we apparantly do some funky stuff with making the bin/ and lib/
# folders which is probably needed to work around a very old CMake bug?
Changed the lib and executable local build so that they all go in bin and lib respectively.
2007-03-13 05:23:09 +08:00
#SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
Ran dos2unix
2007-03-09 17:07:05 +08:00
MAKE_DIRECTORY(${OUTPUT_BINDIR})
From Rene Molenaar, "Using commandline build system nmake on windows does not work. This is caused by the OSG_MSVC_VERSIONED_DLL hack. there are hard-coded paths to place the dll's in the bin /dir that normally would go in the lib/config (release/debug) dirs. Nmake has different locations for the files (no config dir). fix: change the macro's in OsgMacroUtils.cmake for the IF(NOT MSVC_IDE) situation. Libs go in lib/, and DLLs and executables go in bin/ To accopmplish this for MSVC_IDE the targets get a "../../bin" prefix, for nmake this should be "../bin" (because there are no config folders). This fix mimics the behaviour of the MSCV_IDE (visual studio) build system when building with nmake. Note: A change in the main CMakeLists.txt creates the needed plugin directory in the binary dir. see included files for the changes: r7885fix-v2/CMakeModules/OsgMacroUtils.cmake r7885fix-v2/osgWrappers/CMakeLists.txt r7885fix-v2/CMakeLists.txt The behaviour of visual studio projects (and other build systems) remain unchanged. Tested building and installing with nmake and visual studio 8 debug and release. "
2008-02-18 23:26:46 +08:00
IF(MSVC AND NOT MSVC_IDE)
MAKE_DIRECTORY(${OUTPUT_BINDIR}/${OSG_PLUGINS})
ENDIF(MSVC AND NOT MSVC_IDE)
Changed the lib and executable local build so that they all go in bin and lib respectively.
2007-03-13 05:23:09 +08:00
#SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME})
SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
Ran dos2unix
2007-03-09 17:07:05 +08:00
MAKE_DIRECTORY(${OUTPUT_LIBDIR})
From Luigi Calori, introduction of versioning of dll's and placement of dll and plugins into bin directory during build.
2007-08-30 18:41:15 +08:00
IF(NOT MSVC)
From Rene Molenaar, "Using commandline build system nmake on windows does not work. This is caused by the OSG_MSVC_VERSIONED_DLL hack. there are hard-coded paths to place the dll's in the bin /dir that normally would go in the lib/config (release/debug) dirs. Nmake has different locations for the files (no config dir). fix: change the macro's in OsgMacroUtils.cmake for the IF(NOT MSVC_IDE) situation. Libs go in lib/, and DLLs and executables go in bin/ To accopmplish this for MSVC_IDE the targets get a "../../bin" prefix, for nmake this should be "../bin" (because there are no config folders). This fix mimics the behaviour of the MSCV_IDE (visual studio) build system when building with nmake. Note: A change in the main CMakeLists.txt creates the needed plugin directory in the binary dir. see included files for the changes: r7885fix-v2/CMakeModules/OsgMacroUtils.cmake r7885fix-v2/osgWrappers/CMakeLists.txt r7885fix-v2/CMakeLists.txt The behaviour of visual studio projects (and other build systems) remain unchanged. Tested building and installing with nmake and visual studio 8 debug and release. "
2008-02-18 23:26:46 +08:00
MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})
From Luigi Calori, introduction of versioning of dll's and placement of dll and plugins into bin directory during build.
2007-08-30 18:41:15 +08:00
ENDIF(NOT MSVC)
Ran dos2unix
2007-03-09 17:07:05 +08:00
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
# On CMake 2.4.x use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH and later
# we work around the DLL placement by use of the PREFIX target property hack
#
# On CMake 2.6.x use the newly minted CMAKE_LIBRARY_OUTPUT_DIRECTORY,
# CMAKE_ARCHIVE_OUTPUT_DIRECTORY & CMAKE_RUNTIME_OUTPUT_DIRECTORY
Ran dos2unix
2007-03-09 17:07:05 +08:00
From Philip Lowman, post 1: "Here is a collection of changes which should fix issues building the OSG with CMake 2.6.0 (along with some other changes) CMakeLists.txt: * Set CMP0003 to supress warning about linking against -lpthread (which is a non-absolute library location). (CMake 2.6.x fix) * Modified the WIN32_USE_MP and a couple of other Visual Studio specific flags to be in an IF(MSVC) block (minor tweak to reduce exposing this stuff on MinGW builds) * Includes my second set of glu tesselator autodetection changes that you seemed to want but haven't committed yet. src/OpenThreads/pthreads/CMakeLists.txt: * Eliminates warning when compiling on Linux about spaces in link line (CMake 2.6.x fix) CMakeModules/OsgMacroUtils.cmake: * Tweaks to make the macros behave properly under CMake 2.6.0 (doesn't change behavior under CMake 2.4.x) CMakeModules/Find3rdPartyDependencies.cmake: * Adds the NO_DEFAULT_PATH option to all of the search options so that things in C:\Program Files\OpenSceneGraph aren't accidently picked up during configure time and instead only things in the "3rdParty" folder are discovered. (general bugfix) " post 2: "Ok, hold the presses. I just discovered that for some odd reason the osgdb_* plugins under Linux aren't getting put under the osgPlugins-2.5.0 folder. Not exactly sure why this broke, the folder was there, just empty. I'll have to look into it this evening." post 3: "Fixed, was caused by the switch to CMAKE_LIBRARY_OUTPUT_DIRECTORY and some code in osgPlugins/CMakeLists.txt that effectively overrides LIBRARY_OUTPUT_PATH on non-MSVC compilers to dump the plugins in the plugins folder. I tweaked it to override CMAKE_LIBRARY_OUTPUT_DIRECTORY as well. Seems to work fine."
2008-05-27 06:36:58 +08:00
IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
# If CMake >= 2.6.0
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
IF(WIN32)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
ELSE(WIN32)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
ENDIF(WIN32)
ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
Ran dos2unix
2007-03-09 17:07:05 +08:00
#SET(INSTALL_BINDIR OpenSceneGraph/bin)
#SET(INSTALL_INCDIR OpenSceneGraph/include)
#SET(INSTALL_LIBDIR OpenSceneGraph/lib)
#SET(INSTALL_DOCDIR OpenSceneGraph/doc)
################################################################################
# User Options
From Eric Wing, " Here are more changes for the CMake scripts: - I removed CMAKE_INSTALL_PREFIX in FindOpenThreads as a follow up to the discussion thread. - I introduced an experimental CMAKE_PREFIX_PATH to replace it. - I added CMAKE_PREFIX_PATH, CMAKE_INCLUDE_PATH, and CMAKE_LIBRARY_PATH to the CMake GUI so users can enter values there instead of in the environment. - I added OPENSCENEGRAPH_*_VERSION variables (MAJOR, MINOR, PATCH). These should be kept up-to-date with the real version numbers. Mac bundles like to have version information so users can find out the version they are running through standard About panels and also automated system reporters for troubleshooting/bug tracking. In theory, this information could be used for library versioning. We should do the same for OpenThreads, but I forgot about it. - I added some Mac Info.plist stuff (which uses the version information). "
2007-04-27 18:29:48 +08:00
# Expose CMAKE_INCLUDE_PATH and CMAKE_LIBARY_PATH to the GUI so users
# may set these values without needing to manipulate the environment.
SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} CACHE STRING "You may add additional search paths here. Use ; to separate multiple paths.")
SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE STRING "You may add additional search paths here. Use ; to separate multiple paths.")
# We are proposing that a new variable called CMAKE_PREFIX_PATH be introduced
# to CMake to compliment CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
# A formal feature request has been submited to CMake, Bug #4947.
# It is intended for those users who have common prefixes for their INCLUDE
# and LIBRARY locations. So if users have headers in /usr/local/include
# and libraries in /usr/local/lib, the common prefix is /usr/local.
# It should also cover the case where headers and libraries are
# in the same directory.
# Our proposal expects that FIND_* commands will automatically search for
# CMAKE_PREFIX_PATH right after CMAKE_INCLUDE_PATH or CMAKE_LIBRARY_PATH.
# Obviously, since CMake does not currently support this, we must write
# our Find*.cmake modules to explicitly support this. Otherwise, this variable
# will have no impact.
# This is unofficial so this may be removed or changed at anytime.
SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE STRING "(EXPERIMENTAL) You may add additional search paths here. Use ; to separate multiple paths.")
Ran dos2unix
2007-03-09 17:07:05 +08:00
# Dynamic vs Static Linking
OPTION(DYNAMIC_OPENSCENEGRAPH "Set to ON to build OpenSceneGraph for dynamic linking. Use OFF for static." ON)
IF (DYNAMIC_OPENSCENEGRAPH)
Removed tabs
2007-04-11 16:33:40 +08:00
SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED")
Ran dos2unix
2007-03-09 17:07:05 +08:00
ELSE (DYNAMIC_OPENSCENEGRAPH)
Removed tabs
2007-04-11 16:33:40 +08:00
SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
Ran dos2unix
2007-03-09 17:07:05 +08:00
ENDIF(DYNAMIC_OPENSCENEGRAPH)
From Luigi Calori, move to using local CMakeLists.txt files and explicit file lists. From Robert Osfield, small ammendments of the above to seperate example and application installs, and fix the osgPlugins install directory.
2007-03-19 20:30:26 +08:00
INCLUDE(OsgMacroUtils)
Ran dos2unix
2007-03-09 17:07:05 +08:00
# OSG Core
ADD_SUBDIRECTORY(src)
# OSG Applications
OPTION(BUILD_OSG_APPLICATIONS "Enable to build OSG Applications (e.g. osgviewer)" ON)
IF (BUILD_OSG_APPLICATIONS)
Removed tabs
2007-04-11 16:33:40 +08:00
ADD_SUBDIRECTORY(applications)
Ran dos2unix
2007-03-09 17:07:05 +08:00
ENDIF(BUILD_OSG_APPLICATIONS)
# OSG Examples
OPTION(BUILD_OSG_EXAMPLES "Enable to build OSG Examples" OFF)
IF (BUILD_OSG_EXAMPLES)
Removed tabs
2007-04-11 16:33:40 +08:00
ADD_SUBDIRECTORY(examples)
Ran dos2unix
2007-03-09 17:07:05 +08:00
ENDIF(BUILD_OSG_EXAMPLES)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# This is for an advanced option to give aggressive warnings
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# under different compilers. If yours is not implemented, this option
# will not be made available.
IF(CMAKE_COMPILER_IS_GNUCXX)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# To be complete, we might also do GNUCC flags,
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# but everything here is C++ code.
# -Wshadow and -Woverloaded-virtual are also interesting flags, but OSG
# returns too many hits.
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# FYI, if we do implement GNUCC, then -Wmissing-prototypes in another
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# interesting C-specific flag.
From Eric Wing, "I made a mistake in my IF() checks for FOO_CONFIG_HAS_BEEN_RUN_BEFORE. I was using ${FOO_CONFIG_HAS_BEEN_RUN_BEFORE} instead of just FOO_HAS_BEEN_RUN_BEFORE. In this case, it happened to work out to still be correct, but in general it shouldn't have the ${}. (I really hate this syntax.)"
2007-04-25 17:14:01 +08:00
# Also, there is a bug in gcc 4.0. Under C++, -pedantic will create
# errors instead of warnings for certain issues, including superfluous
# semicolons and commas, and the use of long long. -fpermissive seems
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# to be the workaround.
Removed warning type not support by gcc 4.1.x
2007-09-07 21:54:32 +08:00
SET(OSG_AGGRESSIVE_WARNING_FLAGS "-Wall -Wparentheses -Wformat=2 -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive")
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
ELSE(CMAKE_COMPILER_IS_GNUCXX)
IF(MSVC)
# FIXME: What are good aggressive warning flags for Visual Studio?
# And do we need to further subcase this for different versions of VS?
# CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
SET(OSG_AGGRESSIVE_WARNING_FLAGS "/Wall /W4")
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
From Luigi Calori, introduction of versioning of dll's and placement of dll and plugins into bin directory during build.
2007-08-30 18:41:15 +08:00
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
ELSE(MSVC)
# CMake lacks an elseif, so other non-gcc, non-VS compilers need
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# to be listed below. If unhandled, OSG_AGGRESSIVE_WARNING_FLAGS should
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# remain unset.
ENDIF(MSVC)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
# This part is for the CMake menu option to toggle the warnings on/off.
# This will only be made available if we set values for OSG_AGGRESSIVE_WARNING_FLAGS.
IF(OSG_AGGRESSIVE_WARNING_FLAGS)
OPTION(OSG_USE_AGGRESSIVE_WARNINGS "Enable to activate aggressive warnings" OFF)
MARK_AS_ADVANCED(OSG_USE_AGGRESSIVE_WARNINGS)
IF(OSG_USE_AGGRESSIVE_WARNINGS)
IF(NOT "${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
SET(OLD_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE INTERNAL "Old CXX flags")
SET(OLD_CMAKE_CXX_FLAGS_WAS_SET 1 CACHE INTERNAL "Old CXX flags was set")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OSG_AGGRESSIVE_WARNING_FLAGS}" CACHE STRING "Flags used by the compiler during all build types." FORCE)
ENDIF(NOT "${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
ELSE(OSG_USE_AGGRESSIVE_WARNINGS)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# FIXME: This will lose any changes made after OLD_CMAKE_CXX_FLAGS was
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# set. The better way would be to parse the string and remove each
# option explicitly.
IF("${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
SET(CMAKE_CXX_FLAGS "${OLD_CMAKE_CXX_FLAGS}" CACHE STRING "Flags used by the compiler during all build types." FORCE)
SET(OLD_CMAKE_CXX_FLAGS_WAS_SET 0 CACHE INTERNAL "Old CXX flags was set")
ENDIF("${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
ENDIF(OSG_USE_AGGRESSIVE_WARNINGS)
ENDIF(OSG_AGGRESSIVE_WARNING_FLAGS)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
IF(APPLE)
# These are just defaults/recommendations, but how we want to build
# out of the box. But the user needs to be able to change these options.
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# So we must only set the values the first time CMake is run, or we
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# will overwrite any changes the user sets.
# FORCE is used because the options are not reflected in the UI otherwise.
# Seems like a good place to add version specific compiler flags too.
From Eric Wing, "I made a mistake in my IF() checks for FOO_CONFIG_HAS_BEEN_RUN_BEFORE. I was using ${FOO_CONFIG_HAS_BEEN_RUN_BEFORE} instead of just FOO_HAS_BEEN_RUN_BEFORE. In this case, it happened to work out to still be correct, but in general it shouldn't have the ${}. (I really hate this syntax.)"
2007-04-25 17:14:01 +08:00
IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
# This is really fragile, but CMake doesn't provide the OS system
# version information we need. (Darwin versions can be changed
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# independently of OS X versions.)
# It does look like CMake handles the CMAKE_OSX_SYSROOT automatically.
From Eric Sokolowsky, "The check for Leopard to build 4-way binaries by default was broken. Here is an updated CMakeLists.txt file to fix the problem."
2008-07-03 19:07:59 +08:00
IF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
From Eric Sokolowki, disabled default build of 64bit under OSX to prevent build problems
2008-08-06 00:05:59 +08:00
# 64-bit compiles are not supported with Carbon. We should enable
# 64-bit compilation by default once osgviewer has been
# rewritten with Cocoa.
#SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
From Eric Sokolowsky, "The check for Leopard to build 4-way binaries by default was broken. Here is an updated CMakeLists.txt file to fix the problem."
2008-07-03 19:07:59 +08:00
ELSE(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
ELSE(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
# No Universal Binary support
# Should break down further to set the -mmacosx-version-min,
# but the SDK detection is too unreliable here.
ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
From Eric Sokolowsky, "The check for Leopard to build 4-way binaries by default was broken. Here is an updated CMakeLists.txt file to fix the problem."
2008-07-03 19:07:59 +08:00
ENDIF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
From Eric Wing, "I made a mistake in my IF() checks for FOO_CONFIG_HAS_BEEN_RUN_BEFORE. I was using ${FOO_CONFIG_HAS_BEEN_RUN_BEFORE} instead of just FOO_HAS_BEEN_RUN_BEFORE. In this case, it happened to work out to still be correct, but in general it shouldn't have the ${}. (I really hate this syntax.)"
2007-04-25 17:14:01 +08:00
ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
Introduce OSG_BUILD_APPLICATION_BUNDLES option for OSX, defaulting to OFF.
2007-06-05 05:02:15 +08:00
OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
ENDIF(APPLE)
Ran dos2unix
2007-03-09 17:07:05 +08:00
Added wrapper build target for generating the osgWrappers
2008-08-26 20:05:24 +08:00
#
# Provide target for generating wrappers
#
SET(GENWRAPPER genwrapper)
ADD_CUSTOM_TARGET(wrappers
COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -t ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/Doxyfile.template -d ${OpenSceneGraph_SOURCE_DIR} | doxygen -
COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -l ${OpenSceneGraph_SOURCE_DIR}
)
Ran dos2unix
2007-03-09 17:07:05 +08:00
# For Doxygen
INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
OPTION(BUILD_DOCUMENTATION "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
From Mattias Helsing, " * Removed processing of include/OpenThreads in the OpenSceneGraph refman * Clears the mark_as_advanced property of the BUILD_DOCUMENTATION cmake variable (so it gets visible in simple view). "
2008-12-19 19:04:35 +08:00
MARK_AS_ADVANCED(CLEAR BUILD_DOCUMENTATION)
Ran dos2unix
2007-03-09 17:07:05 +08:00
# To build the documention, you will have to enable it
# and then do the equivalent of "make DoxygenDoc".
IF(BUILD_DOCUMENTATION)
From Jean-Christophe Lombardo and Robert Osfield, added BUILD_REF_DOCS_SEARCHENGINE and BUILD_REF_DOCS_TAGFILE options for being doxygen docs.
2008-01-29 02:29:38 +08:00
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
OPTION(BUILD_REF_DOCS_SEARCHENGINE "Enable doxygen's search engine (requires that documentation to be installed on a php enabled web server)" OFF)
Fixed BUILD_REF_DOCS_SEARCHENGINE conditional
2008-01-29 03:54:27 +08:00
IF(BUILD_REF_DOCS_SEARCHENGINE)
From Jean-Christophe Lombardo and Robert Osfield, added BUILD_REF_DOCS_SEARCHENGINE and BUILD_REF_DOCS_TAGFILE options for being doxygen docs.
2008-01-29 02:29:38 +08:00
SET(SEARCHENGINE YES)
Fixed BUILD_REF_DOCS_SEARCHENGINE conditional
2008-01-29 03:54:27 +08:00
ELSE(BUILD_REF_DOCS_SEARCHENGINE)
From Jean-Christophe Lombardo and Robert Osfield, added BUILD_REF_DOCS_SEARCHENGINE and BUILD_REF_DOCS_TAGFILE options for being doxygen docs.
2008-01-29 02:29:38 +08:00
SET(SEARCHENGINE NO)
Fixed BUILD_REF_DOCS_SEARCHENGINE conditional
2008-01-29 03:54:27 +08:00
ENDIF(BUILD_REF_DOCS_SEARCHENGINE)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
OPTION(BUILD_REF_DOCS_TAGFILE "Generate a tag file named osg.tag on the documentation web server" OFF)
From Jean-Christophe Lombardo and Robert Osfield, added BUILD_REF_DOCS_SEARCHENGINE and BUILD_REF_DOCS_TAGFILE options for being doxygen docs.
2008-01-29 02:29:38 +08:00
IF(BUILD_REF_DOCS_TAGFILE)
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
SET(GENERATE_TAGFILE "${OpenSceneGraph_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg.tag")
From Jean-Christophe Lombardo and Robert Osfield, added BUILD_REF_DOCS_SEARCHENGINE and BUILD_REF_DOCS_TAGFILE options for being doxygen docs.
2008-01-29 02:29:38 +08:00
ELSE(BUILD_REF_DOCS_TAGFILE)
SET(GENERATE_TAGFILE "")
ENDIF(BUILD_REF_DOCS_TAGFILE)
From Jean-Sebastien Guay, "This is a fix for the warning we've been discussing on osg-users. CMake 2.6.0 allows quotes to be unescaped in strings in ADD_DEFINITIONS statements, where we had to escape them before (CMake 2.4.x). Setting CMake policy CMP0005 to OLD removes the warning for 2.6.0, and the quotes are still escaped, so it still works with 2.4.x. "
2008-05-31 00:53:45 +08:00
Removed tabs
2007-04-11 16:33:40 +08:00
IF(DOT)
SET(HAVE_DOT YES)
ELSE(DOT)
SET(HAVE_DOT NO)
ENDIF(DOT)
From Mattias Helsing, "I have developed the earlier cpack example a bit. Perhaps you could consider these initial cpack support scripts. It is hidden behind a BUILD_PACKAGES option so won't affect the normal user. The submission 1) set the COMPONENT attribute on all cmake install commands. COMPONENT names are according to http://www.openscenegraph.org/projects/osg/wiki/Community/Packaging 2) provide cmake script and a template for creating CPack configuration files. It will generate target for creating packages with everything that gets "installed" (make package on unx, project PACKAGE in MSVC) plus targets for generating one package per COMPONENT (i.e. libopenscenegraph-core etc.). I have temporariliy uploaded some examples to http://www.openscenegraph.org/projects/osg/wiki/Community/People/MattiasHelsing If this submission makes it into svn we can develop it to generate rpms, installers for windows and mac (I know at least J-S don't like these but there may be others who do ;) and even DEBs (not sure if we can make them "ubuntu-ready" but they eventually may - at least we could put a deb on the website)"
2008-12-12 19:01:09 +08:00
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
# If html help generation was requested. DOCUMENTATION_HTML_HELP is defined by Documentation.cmake
SET(GENERATE_HTMLHELP "NO")
IF(DOCUMENTATION_HTML_HELP)
From Mattias Helsing, " * Removed processing of include/OpenThreads in the OpenSceneGraph refman * Clears the mark_as_advanced property of the BUILD_DOCUMENTATION cmake variable (so it gets visible in simple view). "
2008-12-19 19:04:35 +08:00
# on windows Documentation.cmake finds the html help workshop fi it exists. On u*ix we might have it with wine but no way to point it out
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
IF(NOT WIN32)
SET(HTML_HELP_COMPILER "" CACHE FILEPATH "Enter location of the HTML help compiler to let doxygen compile html")
MARK_AS_ADVANCED(HTML_HELP_COMPILER)
ENDIF(NOT WIN32)
# this var sets a proper value in .doxygen files when coniguring them below
SET(GENERATE_HTMLHELP "YES")
endif(DOCUMENTATION_HTML_HELP)
# This processes our doxyfile.cmake and substitutes paths to generate
Removed tabs
2007-04-11 16:33:40 +08:00
# a final Doxyfile
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/doxyfile.cmake
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile
)
# copy the osg logo to documentations target folder
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
Removed tabs
2007-04-11 16:33:40 +08:00
)
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
#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)
# now set up openthreads documentation generation
IF(BUILD_REF_DOCS_TAGFILE)
SET(GENERATE_TAGFILE "${OpenSceneGraph_BINARY_DIR}/doc/OpenThreadsReferenceDocs/ot.tag")
ENDIF(BUILD_REF_DOCS_TAGFILE)
# This processes our openthreads.doxyfile.cmake and generate a final doxyfile
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/openthreads.doxyfile.cmake
${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile
)
# copy the osg logo to documentations target folder
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
${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)
# Process our other doxyfiles but don't create targets for these
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
${PROJECT_BINARY_DIR}/doc/all_Doxyfile)
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/auto_Doxyfile
${PROJECT_BINARY_DIR}/doc/auto_Doxyfile)
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/core_Doxyfile
${PROJECT_BINARY_DIR}/doc/core_Doxyfile)
Removed tabs
2007-04-11 16:33:40 +08:00
# This creates a new target to build documentation.
# It runs ${DOXYGEN} which is the full path and executable to
# Doxygen on your system, set by the FindDoxygen.cmake module
# (called by FindDocumentation.cmake).
# It runs the final generated Doxyfile against it.
# The DOT_PATH is substituted into the Doxyfile.
From Mattias Helsing,"Added doc/Doxyfiles/openthreads.doxyfile.cmake Updated all doxyfiles under doc/Doxyfiles. They are now all processed by cmake but make targets are only generated for OpenSceneGraphReferenceDocs and OpenThreadsReferenceDocs. The others can be run with doxygen directly in <builddir>/doc. Fixed a copy-paste in openthreads sproc and pthreads CMakeLists Added the osg logo to the html footers Added possibility to get generation of chm files. CMakeLists (toplevel): Added install of osg and ot reference docs. This also generates packaging targets of openscenegraph-doc and openthreads-doc if you have packaging enabled Removed the unused USING_OP_OT_TRIPLE_SET since there was no way of enabling it anyway Removed BUILD_REF_DOCS. IMO it was redundant - BUILD_DOCUMENTATION does the same thing and we get that anyway from including Documentation.cmake. OsgCPack.cmake: Removed generation of PACKAGE_SRC for msvc Added special handling for -doc packaging targets - they don't require system, architecture or compiler"
2008-12-16 19:43:28 +08:00
ADD_CUSTOM_TARGET(doc_openscenegraph ${DOXYGEN}
${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile
)
ADD_CUSTOM_TARGET(doc_openthreads ${DOXYGEN}
${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile
Removed tabs
2007-04-11 16:33:40 +08:00
)
Ran dos2unix
2007-03-09 17:07:05 +08:00
ENDIF(BUILD_DOCUMENTATION)
From Mathieu Marache, added support for CDash
2008-09-25 23:20:20 +08:00
OPTION(BUILD_DASHBOARD_REPORTS "Set to ON to activate reporting of OpenSceneGraph builds here http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph" OFF)
IF(BUILD_DASHBOARD_REPORTS)
# The following are required to uses Dart and the Cdash dashboard
# viewable here : http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph
INCLUDE(Dart)
ENDIF(BUILD_DASHBOARD_REPORTS)
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
# This needs to be run very last so other parts of the scripts can take
# advantage of this.
From Eric Wing, "I made a mistake in my IF() checks for FOO_CONFIG_HAS_BEEN_RUN_BEFORE. I was using ${FOO_CONFIG_HAS_BEEN_RUN_BEFORE} instead of just FOO_HAS_BEEN_RUN_BEFORE. In this case, it happened to work out to still be correct, but in general it shouldn't have the ${}. (I really hate this syntax.)"
2007-04-25 17:14:01 +08:00
IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
SET(OSG_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before")
From Eric Wing, "I made a mistake in my IF() checks for FOO_CONFIG_HAS_BEEN_RUN_BEFORE. I was using ${FOO_CONFIG_HAS_BEEN_RUN_BEFORE} instead of just FOO_HAS_BEEN_RUN_BEFORE. In this case, it happened to work out to still be correct, but in general it shouldn't have the ${}. (I really hate this syntax.)"
2007-04-25 17:14:01 +08:00
ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
From Mathias Helsing, "Cpack support submission with: Better package naming. example openscenegraph-core-2.7.7-Linux-i386.tar.gz on my ubuntu laptop and openscenegraph-core.2.7.7-win32-x86-vc80.tar.gz on winxp. CMakers will not get options for selecting compression format. TGZ goes for all platforms (on win32 I use 7zip) The wrappers is now given the COMPONENT name libopenscenegraph-wrappers. Feel free to change the name. On windows with visual studio the OsgCPack script make some efforts to discover the compiler used but support is a bit poor so I've given CMake acces to OSG_CPACK_COMPILER to provide some mean to name the compiler. stop The platform part is taken from CMAKE_SYSTEM_NAME and for windows I change this to win32 or win64 based on CMAKE_CL_64. This might not be necessary if the arch part has that information. This information is taken from CMAKE_SYSTEM_PROCESSOR. I only have 32bit here so if some of you could uncomment line 15,16 in OsgCPack.cmake and report what cmake report it would be nice. I'm especially interested anything but win32 and linux32"
2008-12-15 22:07:29 +08:00
# CPack is only available for cmake version >= 2.6.0
IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
# If CMake >= 2.6.0
OPTION(BUILD_OSG_PACKAGES "Set to ON to generate CPack configuration files and default packaging targets" OFF)
IF(BUILD_OSG_PACKAGES)
INCLUDE(OsgCPack)
ENDIF(BUILD_OSG_PACKAGES)
ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
From Eric Wing, " Changes include: A internal cache flag that can be used to detect if this is the first time running the CMake configuration. This is needed to work around stupid CMake UI shortcomings about the UI not reflecting anything you SET unless you use FORCE. But if you use FORCE, you override anything the user may try to set/override unless you have an exception check. It turns out the exception check you need is often the first-run check. This flag is potentially useful for other things too. An optional switch that turns on more aggressive warnings based on your compiler. Some Apple specific stuff for detecting the OS version and enabling Universal Binaries (and some additional compiler flags that are good but gcc version dependent). The version check code is unfortunately really fragile. I need to lobby CMake to return the OS X version number for us. FYI, building Universal will fail with the current CMake release due to a bug, but is now fixed in CVS. "
2007-04-11 16:35:39 +08:00
From David Callu, "I have added the uninstall command at the end of the first file, and the configuration file template use by the command is the second file. The command use the cmake_install.cmake file which list all file installed by the install target. this issue come from the CMake FAQ"
2007-05-17 19:48:30 +08:00
#-----------------------------------------------------------------------------
### uninstall target
#-----------------------------------------------------------------------------
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
Reference in New Issue Copy Permalink