FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Rafa Gaitan, "I have added the macro SETUP_LIBRARY, similar to SETUP_PLUGIN or

Browse Source 
SETUP_EXE, in order to have a unique entry point to build the
libraries. With this changes the android integration will be less
painful (currently is a big IF(ANDROID) for each CMakeLists.txt) and
more maintainable in the future. I hope next submissions will be for
supporting android from my colleague Jorge.
"
This commit is contained in:
Robert Osfield 2011-03-08 13:51:13 +00:00
parent 91b35436ac
commit 42b709a9f4
19 changed files with 156 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeModules/ModuleInstall.cmake
View File

@ -2,7 +2,7 @@
# Required Vars: # Required Vars:
# ${LIB_NAME} # ${LIB_NAME}
# ${LIB_PUBLIC_HEADERS} # ${TARGET_H}
SET(INSTALL_INCDIR include) SET(INSTALL_INCDIR include)
SET(INSTALL_BINDIR bin) SET(INSTALL_BINDIR bin)
@ -18,7 +18,7 @@ SET(HEADERS_GROUP "Header Files")
SOURCE_GROUP( SOURCE_GROUP(
${HEADERS_GROUP} ${HEADERS_GROUP}
FILES ${LIB_PUBLIC_HEADERS} FILES ${TARGET_H}
) )
IF(MSVC AND OSG_MSVC_VERSIONED_DLL) IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
@ -34,7 +34,7 @@ INSTALL(
IF(NOT OSG_COMPILE_FRAMEWORKS) IF(NOT OSG_COMPILE_FRAMEWORKS)
INSTALL ( INSTALL (
FILES ${LIB_PUBLIC_HEADERS} FILES ${TARGET_H}
DESTINATION ${INSTALL_INCDIR}/${LIB_NAME} DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}
COMPONENT libopenscenegraph-dev COMPONENT libopenscenegraph-dev
) )
@ -45,7 +45,7 @@ ELSE()
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
FRAMEWORK TRUE FRAMEWORK TRUE
FRAMEWORK_VERSION ${OPENSCENEGRAPH_SOVERSION} FRAMEWORK_VERSION ${OPENSCENEGRAPH_SOVERSION}
PUBLIC_HEADER "${LIB_PUBLIC_HEADERS}" PUBLIC_HEADER "${TARGET_H}"
INSTALL_NAME_DIR "${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}" INSTALL_NAME_DIR "${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}"
) )
# MESSAGE("${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}") # MESSAGE("${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}")

42
CMakeModules/OsgMacroUtils.cmake
View File

@ -197,6 +197,48 @@ MACRO(SET_OUTPUT_DIR_PROPERTY_260 TARGET_TARGETNAME RELATIVE_OUTDIR)
ENDMACRO(SET_OUTPUT_DIR_PROPERTY_260 TARGET_TARGETNAME RELATIVE_OUTDIR) ENDMACRO(SET_OUTPUT_DIR_PROPERTY_260 TARGET_TARGETNAME RELATIVE_OUTDIR)
#######################################################################################################
# macro for common setup of libraries it expect some variables to be set:
# either within the local CMakeLists or higher in hierarchy
# LIB_NAME is the name of the target library
# TARGET_SRC are the sources of the target
# TARGET_H are the eventual headers of the target
# TARGET_LIBRARIES are the libraries to link to that are internal to the project and have d suffix for debug
# TARGET_EXTERNAL_LIBRARIES are external libraries and are not differentiated with d suffix
# TARGET_LABEL is the label IDE should show up for targets
##########################################################################################################
MACRO(SETUP_LIBRARY LIB_NAME)
SET(TARGET_NAME ${LIB_NAME} )
SET(TARGET_TARGETNAME ${LIB_NAME} )
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${TARGET_H}
${TARGET_SRC}
)
IF(TARGET_LABEL)
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
ENDIF(TARGET_LABEL)
IF(TARGET_LIBRARIES)
LINK_INTERNAL(${LIB_NAME} ${TARGET_LIBRARIES})
ENDIF()
IF(TARGET_EXTERNAL_LIBRARIES)
LINK_EXTERNAL(${LIB_NAME} ${TARGET_EXTERNAL_LIBRARIES})
ENDIF()
IF(TARGET_LIBRARIES_VARS)
LINK_WITH_VARIABLES(${LIB_NAME} ${TARGET_LIBRARIES_VARS})
ENDIF(TARGET_LIBRARIES_VARS)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)
ENDMACRO(SETUP_LIBRARY LIB_NAME)
MACRO(SETUP_PLUGIN PLUGIN_NAME) MACRO(SETUP_PLUGIN PLUGIN_NAME)
SET(TARGET_NAME ${PLUGIN_NAME} ) SET(TARGET_NAME ${PLUGIN_NAME} )

31
src/osg/CMakeLists.txt
View File

@ -8,7 +8,6 @@ ENDIF()
SET(LIB_NAME osg) SET(LIB_NAME osg)
# #
# Enable workaround for OpenGL driver crash with occlusion query # Enable workaround for OpenGL driver crash with occlusion query
# #
@ -19,7 +18,7 @@ ENDIF()
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/AlphaFunc ${HEADER_PATH}/AlphaFunc
${HEADER_PATH}/AnimationPath ${HEADER_PATH}/AnimationPath
${HEADER_PATH}/ApplicationUsage ${HEADER_PATH}/ApplicationUsage
@ -196,9 +195,10 @@ SET(LIB_PUBLIC_HEADERS
${OPENSCENEGRAPH_CONFIG_HEADER} ${OPENSCENEGRAPH_CONFIG_HEADER}
) )
ADD_LIBRARY(${LIB_NAME} #ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} # ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS} # ${LIB_PUBLIC_HEADERS}
SET(TARGET_SRC
AlphaFunc.cpp AlphaFunc.cpp
AnimationPath.cpp AnimationPath.cpp
ApplicationUsage.cpp ApplicationUsage.cpp
@ -373,11 +373,22 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
SET(TARGET_LIBRARIES OpenThreads)
LINK_INTERNAL(${LIB_NAME} SET(TARGET_EXTERNAL_LIBRARIES
OpenThreads ${CMAKE_THREAD_LIBS_INIT}
${MATH_LIBRARY}
${RT_LIBRARY}
${DL_LIBRARY}
) )
LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} ${DL_LIBRARY})
LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} )
INCLUDE(ModuleInstall OPTIONAL) #LINK_INTERNAL(${LIB_NAME}
# OpenThreads
#)
#LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} ${DL_LIBRARY})
#LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} )
#INCLUDE(ModuleInstall OPTIONAL)
SETUP_LIBRARY(${LIB_NAME})

15
src/osgAnimation/CMakeLists.txt
View File

@ -1,4 +1,3 @@
IF(DYNAMIC_OPENSCENEGRAPH) IF(DYNAMIC_OPENSCENEGRAPH)
ADD_DEFINITIONS(-DOSGANIMATION_LIBRARY) ADD_DEFINITIONS(-DOSGANIMATION_LIBRARY)
ELSE() ELSE()
@ -7,9 +6,8 @@ ENDIF()
SET(LIB_NAME osgAnimation) SET(LIB_NAME osgAnimation)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/Action ${HEADER_PATH}/Action
${HEADER_PATH}/ActionAnimation ${HEADER_PATH}/ActionAnimation
${HEADER_PATH}/ActionBlendIn ${HEADER_PATH}/ActionBlendIn
@ -57,10 +55,7 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/VertexInfluence ${HEADER_PATH}/VertexInfluence
) )
SET(TARGET_SRC
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
Action.cpp Action.cpp
ActionAnimation.cpp ActionAnimation.cpp
ActionBlendIn.cpp ActionBlendIn.cpp
@ -98,7 +93,7 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osg osg
osgText osgText
osgGA osgGA
@ -106,5 +101,5 @@ LINK_INTERNAL(${LIB_NAME}
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME}) SETUP_LIBRARY(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

19
src/osgDB/CMakeLists.txt
View File

@ -44,7 +44,7 @@ ENDIF()
SET(LIB_NAME osgDB) SET(LIB_NAME osgDB)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/DataTypes ${HEADER_PATH}/DataTypes
${HEADER_PATH}/StreamOperator ${HEADER_PATH}/StreamOperator
${HEADER_PATH}/Serializer ${HEADER_PATH}/Serializer
@ -81,10 +81,7 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/XmlParser ${HEADER_PATH}/XmlParser
) )
# FIXME: For OS X, need flag for Framework or dylib SET(TARGET_SRC
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
ObjectWrapper.cpp ObjectWrapper.cpp
InputStream.cpp InputStream.cpp
OutputStream.cpp OutputStream.cpp
@ -160,17 +157,13 @@ ENDIF()
ADD_DEFINITIONS(-DOSG_PLUGIN_EXTENSION=${CMAKE_SHARED_MODULE_SUFFIX}) ADD_DEFINITIONS(-DOSG_PLUGIN_EXTENSION=${CMAKE_SHARED_MODULE_SUFFIX})
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osg osg
osgUtil osgUtil
OpenThreads OpenThreads
) )
LINK_EXTERNAL(${LIB_NAME} ${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} ${DL_LIBRARY}) SET(TARGET_EXTERNAL_LIBRARIES ${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} ${DL_LIBRARY})
LINK_WITH_VARIABLES(${LIB_NAME} ${COMPRESSION_LIBRARIES}) SET(TARGET_LIBRARIES_VARS ${COMPRESSION_LIBRARIES})
LINK_CORELIB_DEFAULT(${LIB_NAME})
IF( ZLIB_FOUND ) SETUP_LIBRARY(${LIB_NAME})
SET( TARGET_LIBRARIES_VARS ZLIB_LIBRARY )
ENDIF( ZLIB_FOUND )
INCLUDE(ModuleInstall OPTIONAL)

11
src/osgFX/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgFX) SET(LIB_NAME osgFX)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/AnisotropicLighting ${HEADER_PATH}/AnisotropicLighting
${HEADER_PATH}/BumpMapping ${HEADER_PATH}/BumpMapping
${HEADER_PATH}/Cartoon ${HEADER_PATH}/Cartoon
@ -24,9 +24,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
AnisotropicLighting.cpp AnisotropicLighting.cpp
BumpMapping.cpp BumpMapping.cpp
Cartoon.cpp Cartoon.cpp
@ -42,12 +40,11 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgUtil osgUtil
osgDB osgDB
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

12
src/osgGA/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF(DYNAMIC_OPENSCENEGRAPH)
SET(LIB_NAME osgGA) SET(LIB_NAME osgGA)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/AnimationPathManipulator ${HEADER_PATH}/AnimationPathManipulator
${HEADER_PATH}/DriveManipulator ${HEADER_PATH}/DriveManipulator
${HEADER_PATH}/EventQueue ${HEADER_PATH}/EventQueue
@ -33,10 +33,7 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/CameraViewSwitchManipulator ${HEADER_PATH}/CameraViewSwitchManipulator
) )
# FIXME: For OS X, need flag for Framework or dylib SET(TARGET_SRC
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
AnimationPathManipulator.cpp AnimationPathManipulator.cpp
DriveManipulator.cpp DriveManipulator.cpp
EventQueue.cpp EventQueue.cpp
@ -61,13 +58,12 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgDB osgDB
osgUtil osgUtil
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME}) SETUP_LIBRARY(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

11
src/osgManipulator/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgManipulator) SET(LIB_NAME osgManipulator)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/AntiSquish ${HEADER_PATH}/AntiSquish
${HEADER_PATH}/Command ${HEADER_PATH}/Command
${HEADER_PATH}/CommandManager ${HEADER_PATH}/CommandManager
@ -34,9 +34,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
AntiSquish.cpp AntiSquish.cpp
Command.cpp Command.cpp
Constraint.cpp Constraint.cpp
@ -60,13 +58,12 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgViewer osgViewer
osgGA osgGA
osgUtil osgUtil
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

11
src/osgParticle/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgParticle) SET(LIB_NAME osgParticle)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/AccelOperator ${HEADER_PATH}/AccelOperator
${HEADER_PATH}/AngularAccelOperator ${HEADER_PATH}/AngularAccelOperator
${HEADER_PATH}/BoxPlacer ${HEADER_PATH}/BoxPlacer
@ -60,9 +60,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
ConnectedParticleSystem.cpp ConnectedParticleSystem.cpp
Emitter.cpp Emitter.cpp
ExplosionDebrisEffect.cpp ExplosionDebrisEffect.cpp
@ -90,12 +88,11 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgUtil osgUtil
osgDB osgDB
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

12
src/osgPresentation/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgPresentation) SET(LIB_NAME osgPresentation)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/AnimationMaterial ${HEADER_PATH}/AnimationMaterial
${HEADER_PATH}/CompileSlideCallback ${HEADER_PATH}/CompileSlideCallback
@ -17,9 +17,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
AnimationMaterial.cpp AnimationMaterial.cpp
CompileSlideCallback.cpp CompileSlideCallback.cpp
PickEventHandler.cpp PickEventHandler.cpp
@ -28,7 +26,7 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgViewer osgViewer
osgManipulator osgManipulator
osgVolume osgVolume
@ -40,6 +38,6 @@ LINK_INTERNAL(${LIB_NAME}
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

18
src/osgQt/CMakeLists.txt
View File

@ -14,8 +14,7 @@ SET(SOURCES_H
QT4_WRAP_CPP( SOURCES_H_MOC ${SOURCES_H} OPTIONS "-f" ) QT4_WRAP_CPP( SOURCES_H_MOC ${SOURCES_H} OPTIONS "-f" )
SET(TARGET_H
SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/GraphicsWindowQt ${HEADER_PATH}/GraphicsWindowQt
${HEADER_PATH}/QFontImplementation ${HEADER_PATH}/QFontImplementation
@ -26,9 +25,7 @@ SET(LIB_PUBLIC_HEADERS
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
GraphicsWindowQt.cpp GraphicsWindowQt.cpp
QFontImplementation.cpp QFontImplementation.cpp
QGraphicsViewAdapter.cpp QGraphicsViewAdapter.cpp
@ -37,7 +34,7 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgWidget osgWidget
osgDB osgDB
osgUtil osgUtil
@ -50,9 +47,12 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
ENDIF() ENDIF()
TARGET_LINK_LIBRARIES(${LIB_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}) SET(TARGET_LIBRARIES_VARS
QT_QTCORE_LIBRARY
QT_QTGUI_LIBRARY
QT_QTOPENGL_LIBRARY
)
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
LINK_CORELIB_DEFAULT(${LIB_NAME}) SETUP_LIBRARY(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

12
src/osgShadow/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgShadow) SET(LIB_NAME osgShadow)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/OccluderGeometry ${HEADER_PATH}/OccluderGeometry
${HEADER_PATH}/ShadowMap ${HEADER_PATH}/ShadowMap
@ -30,9 +30,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
OccluderGeometry.cpp OccluderGeometry.cpp
ShadowMap.cpp ShadowMap.cpp
ShadowTechnique.cpp ShadowTechnique.cpp
@ -53,12 +51,12 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgUtil osgUtil
osgDB osgDB
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

13
src/osgSim/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgSim) SET(LIB_NAME osgSim)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/BlinkSequence ${HEADER_PATH}/BlinkSequence
${HEADER_PATH}/ColorRange ${HEADER_PATH}/ColorRange
${HEADER_PATH}/DOFTransform ${HEADER_PATH}/DOFTransform
@ -35,9 +35,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
BlinkSequence.cpp BlinkSequence.cpp
ColorRange.cpp ColorRange.cpp
DOFTransform.cpp DOFTransform.cpp
@ -65,13 +63,14 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgText osgText
osgUtil osgUtil
osgDB osgDB
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

12
src/osgTerrain/CMakeLists.txt
View File

@ -6,7 +6,7 @@ ENDIF()
SET(LIB_NAME osgTerrain) SET(LIB_NAME osgTerrain)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/Locator ${HEADER_PATH}/Locator
${HEADER_PATH}/Layer ${HEADER_PATH}/Layer
@ -19,9 +19,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
Layer.cpp Layer.cpp
Locator.cpp Locator.cpp
TerrainTile.cpp TerrainTile.cpp
@ -32,14 +30,12 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgUtil osgUtil
osgDB osgDB
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)
SETUP_LIBRARY(${LIB_NAME})

12
src/osgText/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgText) SET(LIB_NAME osgText)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/Font ${HEADER_PATH}/Font
${HEADER_PATH}/Font3D ${HEADER_PATH}/Font3D
@ -23,9 +23,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
DefaultFont.cpp DefaultFont.cpp
DefaultFont.h DefaultFont.h
GlyphGeometry.h GlyphGeometry.h
@ -42,12 +40,12 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC} ${OPENSCENEGRAPH_VERSIONINFO_RC}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgDB osgDB
osg osg
osgUtil osgUtil
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

12
src/osgUtil/CMakeLists.txt
View File

@ -8,7 +8,7 @@ ENDIF()
SET(LIB_NAME osgUtil) SET(LIB_NAME osgUtil)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/ConvertVec ${HEADER_PATH}/ConvertVec
${HEADER_PATH}/CubeMapGenerator ${HEADER_PATH}/CubeMapGenerator
${HEADER_PATH}/CullVisitor ${HEADER_PATH}/CullVisitor
@ -52,9 +52,7 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version ${HEADER_PATH}/Version
) )
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
CubeMapGenerator.cpp CubeMapGenerator.cpp
CullVisitor.cpp CullVisitor.cpp
DelaunayTriangulator.cpp DelaunayTriangulator.cpp
@ -110,10 +108,10 @@ ADD_LIBRARY(${LIB_NAME}
INCLUDE_DIRECTORIES("tristripper/include") INCLUDE_DIRECTORIES("tristripper/include")
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

28
src/osgViewer/CMakeLists.txt
View File

@ -8,7 +8,7 @@ ENDIF()
SET(LIB_NAME osgViewer) SET(LIB_NAME osgViewer)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/CompositeViewer ${HEADER_PATH}/CompositeViewer
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/GraphicsWindow ${HEADER_PATH}/GraphicsWindow
@ -51,7 +51,7 @@ IF(WIN32)
ADD_DEFINITIONS(-DOSG_MULTIMONITOR_MULTITHREAD_WIN32_NVIDIA_WORKAROUND) ADD_DEFINITIONS(-DOSG_MULTIMONITOR_MULTITHREAD_WIN32_NVIDIA_WORKAROUND)
ENDIF() ENDIF()
SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} SET(TARGET_H ${TARGET_H}
${HEADER_PATH}/api/Win32/GraphicsHandleWin32 ${HEADER_PATH}/api/Win32/GraphicsHandleWin32
${HEADER_PATH}/api/Win32/GraphicsWindowWin32 ${HEADER_PATH}/api/Win32/GraphicsWindowWin32
${HEADER_PATH}/api/Win32/PixelBufferWin32 ${HEADER_PATH}/api/Win32/PixelBufferWin32
@ -87,7 +87,7 @@ ELSE()
SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Cocoa) SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Cocoa)
SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Cocoa/PixelBufferCocoa PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Cocoa) SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Cocoa/PixelBufferCocoa PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Cocoa)
ELSE() ELSE()
SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} SET(TARGET_H ${TARGET_H}
${HEADER_PATH}/api/Cocoa/GraphicsHandleCocoa ${HEADER_PATH}/api/Cocoa/GraphicsHandleCocoa
${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa ${HEADER_PATH}/api/Cocoa/GraphicsWindowCocoa
${HEADER_PATH}/api/Cocoa/PixelBufferCocoa ${HEADER_PATH}/api/Cocoa/PixelBufferCocoa
@ -115,7 +115,7 @@ ELSE()
SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Carbon) SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Carbon)
SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Carbon/PixelBufferCarbon PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Carbon) SET_PROPERTY(SOURCE ${HEADER_PATH}/api/Carbon/PixelBufferCarbon PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/Carbon)
ELSE() ELSE()
SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} SET(TARGET_H ${TARGET_H}
${HEADER_PATH}/api/Carbon/GraphicsHandleCarbon ${HEADER_PATH}/api/Carbon/GraphicsHandleCarbon
${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon ${HEADER_PATH}/api/Carbon/GraphicsWindowCarbon
${HEADER_PATH}/api/Carbon/PixelBufferCarbon ${HEADER_PATH}/api/Carbon/PixelBufferCarbon
@ -142,7 +142,7 @@ ELSE()
SET_PROPERTY(SOURCE ${HEADER_PATH}/api/IOS/GraphicsWindowIOS PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/IOS) SET_PROPERTY(SOURCE ${HEADER_PATH}/api/IOS/GraphicsWindowIOS PROPERTY MACOSX_PACKAGE_LOCATION Headers/api/IOS)
ELSE() ELSE()
SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} SET(TARGET_H ${TARGET_H}
${HEADER_PATH}/api/IOS/GraphicsWindowIOS ${HEADER_PATH}/api/IOS/GraphicsWindowIOS
#${HEADER_PATH}/api/IOS/PixelBufferIOS #${HEADER_PATH}/api/IOS/PixelBufferIOS
) )
@ -170,7 +170,7 @@ ELSE()
SET(OSGVIEWER_USE_XRANDR OFF) SET(OSGVIEWER_USE_XRANDR OFF)
ENDIF() ENDIF()
SET(LIB_PUBLIC_HEADERS ${LIB_PUBLIC_HEADERS} SET(TARGET_H ${TARGET_H}
${HEADER_PATH}/api/X11/GraphicsHandleX11 ${HEADER_PATH}/api/X11/GraphicsHandleX11
${HEADER_PATH}/api/X11/GraphicsWindowX11 ${HEADER_PATH}/api/X11/GraphicsWindowX11
${HEADER_PATH}/api/X11/PixelBufferX11 ${HEADER_PATH}/api/X11/PixelBufferX11
@ -221,15 +221,13 @@ ELSE()
ENDIF() ENDIF()
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
${LIB_PRIVATE_HEADERS} ${LIB_PRIVATE_HEADERS}
${LIB_COMMON_FILES} ${LIB_COMMON_FILES}
) )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgGA osgGA
osgText osgText
osgDB osgDB
@ -238,17 +236,15 @@ LINK_INTERNAL(${LIB_NAME}
OpenThreads OpenThreads
) )
LINK_EXTERNAL(${LIB_NAME} ${LIB_EXTRA_LIBS}) SET(TARGET_EXTERNAL_LIBRARIES ${LIB_EXTRA_LIBS})
LINK_CORELIB_DEFAULT(${LIB_NAME})
IF(MINGW OR CYGWIN) IF(MINGW OR CYGWIN)
LINK_EXTERNAL(${LIB_NAME} gdi32 ) SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARY} gdi32 )
ENDIF() ENDIF()
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})
FOREACH(INCLUDEFILE ${LIB_PUBLIC_HEADERS} ) FOREACH(INCLUDEFILE ${TARGET_H} )
FILE(RELATIVE_PATH REL_INCLUDEFILE ${HEADER_PATH} ${INCLUDEFILE}) FILE(RELATIVE_PATH REL_INCLUDEFILE ${HEADER_PATH} ${INCLUDEFILE})
GET_FILENAME_COMPONENT(REL_INCLUDE_PATH ${REL_INCLUDEFILE} PATH) GET_FILENAME_COMPONENT(REL_INCLUDE_PATH ${REL_INCLUDEFILE} PATH)
INSTALL( INSTALL(

13
src/osgVolume/CMakeLists.txt
View File

@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgVolume) SET(LIB_NAME osgVolume)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/FixedFunctionTechnique ${HEADER_PATH}/FixedFunctionTechnique
${HEADER_PATH}/Layer ${HEADER_PATH}/Layer
@ -21,9 +21,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
FixedFunctionTechnique.cpp FixedFunctionTechnique.cpp
Layer.cpp Layer.cpp
Locator.cpp Locator.cpp
@ -38,13 +36,14 @@ ADD_LIBRARY(${LIB_NAME}
SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY ) SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgUtil osgUtil
osgDB osgDB
osgGA osgGA
osg osg
OpenThreads OpenThreads
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})

12
src/osgWidget/CMakeLists.txt
View File

@ -6,7 +6,7 @@ ENDIF()
SET(LIB_NAME osgWidget) SET(LIB_NAME osgWidget)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS SET(TARGET_H
${HEADER_PATH}/Export ${HEADER_PATH}/Export
${HEADER_PATH}/Box ${HEADER_PATH}/Box
${HEADER_PATH}/Browser ${HEADER_PATH}/Browser
@ -34,9 +34,7 @@ SET(LIB_PUBLIC_HEADERS
) )
# FIXME: For OS X, need flag for Framework or dylib # FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME} SET(TARGET_SRC
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
Box.cpp Box.cpp
Browser.cpp Browser.cpp
PdfReader.cpp PdfReader.cpp
@ -61,7 +59,7 @@ ADD_LIBRARY(${LIB_NAME}
SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY ) SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY )
LINK_INTERNAL(${LIB_NAME} SET(TARGET_LIBRARIES
osgText osgText
osgViewer osgViewer
osgDB osgDB
@ -69,6 +67,6 @@ LINK_INTERNAL(${LIB_NAME}
OpenThreads OpenThreads
osgGA osgGA
) )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL) SETUP_LIBRARY(${LIB_NAME})