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

From Luigi Calori, "when we link against something that comes out from a Find... we ususally have a variable <LINK_VAR_NAME>available like OPENTHREADS_LIBRARY,

Browse Source 
so I' ve set up a macro that uses the variable name expanded for linking, and  test if a variable ${LINK_VAR_NAME}_DEBUG
like OPENTHREADS_LIBRARY_DEBUG exists and in case uses it for linking in debug mode.
I' ve also set up FindOpenThreads to set up these variables.
I had to edit the core libraries CMakeLists to add the calls to the macros used.
I' ve tested under MSVC"
This commit is contained in:
Robert Osfield
2007-03-26 13:02:38 +00:00
parent 7013c12a0d
commit b419fa93ef
14 changed files with 127 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeModules/FindOpenThreads.cmake
View File

@@ -39,7 +39,25 @@ FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsd OpenThreadsWin32 OpenThreadsWin32d
NAMES OpenThreads OpenThreadsWin32
PATHS
${CMAKE_INSTALL_PREFIX}/lib
$ENV{OPENTHREADS_DIR}/lib
$ENV{OSG_DIR}/lib
~/Library/Frameworks
/Library/Frameworks
/usr/local/lib64
/usr/local/lib
/usr/lib64
/usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
/opt/lib
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
)
FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
PATHS
${CMAKE_INSTALL_PREFIX}/lib
$ENV{OPENTHREADS_DIR}/lib
@@ -60,6 +78,10 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
SET(OPENTHREADS_FOUND "NO")
IF(OPENTHREADS_INCLUDE_DIR AND OPENTHREADS_LIBRARY)
SET(OPENTHREADS_FOUND "YES")
MESSAGE("-- Found OpenThreads: "${OPENTHREADS_LIBRARY})
MESSAGE("-- Found OpenThreads: "${OPENTHREADS_LIBRARY})
IF(NOT OPENTHREADS_LIBRARY_DEBUG)
MESSAGE("-- Warning Debug OpenThreads not found, using: ${OPENTHREADS_LIBRARY}")
SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}")
ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
ENDIF(OPENTHREADS_INCLUDE_DIR AND OPENTHREADS_LIBRARY)

97
CMakeModules/OsgMacroUtils.cmake
View File

@@ -1,3 +1,50 @@
#######################################################################################################
# macro for linking libraries that come from Findxxxx commands, so there is a variable that contains the
# full path of the library name. in order to differentiate release and debug, this macro get the
# NAME of the variables, so the macro gets as arguments the target name and the following list of parameters
# is intended as a list of variable names each one containing the path of the libraries to link to
# The existance of a varibale name with _DEBUG appended is tested and, in case it' s value is used
# for linking to when in debug mode
# the content of this library for linking when in debugging
#######################################################################################################
MACRO(LINK_WITH_VARIABLES TRGTNAME)
FOREACH(varname ${ARGN})
IF(${varname}_DEBUG)
TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}}" debug "${${varname}_DEBUG}")
ELSE(${varname}_DEBUG)
TARGET_LINK_LIBRARIES(${TRGTNAME} "${${varname}}" )
ENDIF(${varname}_DEBUG)
ENDFOREACH(varname)
ENDMACRO(LINK_WITH_VARIABLES TRGTNAME)
MACRO(LINK_INTERNAL TRGTNAME)
FOREACH(LINKLIB ${ARGN})
TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
ENDFOREACH(LINKLIB)
ENDMACRO(LINK_INTERNAL TRGTNAME)
MACRO(LINK_EXTERNAL TRGTNAME)
FOREACH(LINKLIB ${ARGN})
TARGET_LINK_LIBRARIES(${TRGTNAME} "${LINKLIB}" )
ENDFOREACH(LINKLIB)
ENDMACRO(LINK_EXTERNAL TRGTNAME)
#######################################################################################################
# macro for common setup of core libraries: it links OPENGL_LIBRARIES in undifferentiated mode and
# OPENTHREADS_LIBRARY as Differentiated, so if existe the variable OPENTHREADS_LIBRARY_DEBUG, it uses
# the content of this library for linking when in debugging
#######################################################################################################
MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
LINK_EXTERNAL(${CORELIB_NAME} ${OPENGL_LIBRARIES})
LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY)
ENDMACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
#######################################################################################################
# macro for common setup of plugins, examples and applications it expect some variables to be set:
# either within the local CMakeLists or higher in hierarchy
@@ -11,33 +58,37 @@
##########################################################################################################
MACRO(SETUP_LINK_LIBRARIES)
######################################################################
#
# This set up the libraries to link to, it assumes there are two variable: one common for a group of examples or plagins
# kept in the variable TARGET_COMMON_LIBRARIES and an example or plugin specific kept in TARGET_ADDED_LIBRARIES
# they are combined in a single list checked for unicity
# the suffix ${CMAKE_DEBUG_POSTFIX} is used for differentiating optimized and debug
#
# a second variable TARGET_EXTERNAL_LIBRARIES hold the list of libraries not differentiated between debug and optimized
##################################################################################
SET(TARGET_LIBRARIES ${TARGET_COMMON_LIBRARIES})
FOREACH(LINKLIB ${TARGET_ADDED_LIBRARIES})
######################################################################
#
# This set up the libraries to link to, it assumes there are two variable: one common for a group of examples or plagins
# kept in the variable TARGET_COMMON_LIBRARIES and an example or plugin specific kept in TARGET_ADDED_LIBRARIES
# they are combined in a single list checked for unicity
# the suffix ${CMAKE_DEBUG_POSTFIX} is used for differentiating optimized and debug
#
# a second variable TARGET_EXTERNAL_LIBRARIES hold the list of libraries not differentiated between debug and optimized
##################################################################################
SET(TARGET_LIBRARIES ${TARGET_COMMON_LIBRARIES})
FOREACH(LINKLIB ${TARGET_ADDED_LIBRARIES})
SET(TO_INSERT TRUE)
FOREACH (value ${TARGET_COMMON_LIBRARIES})
IF (${value} STREQUAL ${LINKLIB})
SET(TO_INSERT FALSE)
ENDIF (${value} STREQUAL ${LINKLIB})
ENDFOREACH (value ${TARGET_COMMON_LIBRARIES})
IF (${value} STREQUAL ${LINKLIB})
SET(TO_INSERT FALSE)
ENDIF (${value} STREQUAL ${LINKLIB})
ENDFOREACH (value ${TARGET_COMMON_LIBRARIES})
IF(TO_INSERT)
LIST(APPEND TARGET_LIBRARIES ${LINKLIB})
LIST(APPEND TARGET_LIBRARIES ${LINKLIB})
ENDIF(TO_INSERT)
ENDFOREACH(LINKLIB)
FOREACH(LINKLIB ${TARGET_LIBRARIES})
TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
ENDFOREACH(LINKLIB)
FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
ENDFOREACH(LINKLIB)
ENDFOREACH(LINKLIB)
FOREACH(LINKLIB ${TARGET_LIBRARIES})
TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
ENDFOREACH(LINKLIB)
FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
ENDFOREACH(LINKLIB)
ENDMACRO(SETUP_LINK_LIBRARIES)
############################################################################################

7
src/osg/CMakeLists.txt
View File

@@ -291,10 +291,7 @@ ADD_LIBRARY(${LIB_NAME}
dxtctool.h
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
${MATH_LIBRARY}
)
LINK_EXTERNAL(${LIB_NAME} ${MATH_LIBRARY} )
LINK_CORELIB_DEFAULT(${LIB_NAME} ${MATH_LIBRARY} )
INCLUDE(ModuleInstall OPTIONAL)

7
src/osgDB/CMakeLists.txt
View File

@@ -59,11 +59,10 @@ IF(APPLE)
SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY})
ENDIF(APPLE)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
${OSGDB_PLATFORM_SPECIFIC_LIBRARIES}
)
LINK_EXTERNAL(${LIB_NAME} ${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} )
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

5
src/osgFX/CMakeLists.txt
View File

@@ -37,12 +37,11 @@ ADD_LIBRARY(${LIB_NAME}
Validator.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osgUtil
osgDB
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

6
src/osgIntrospection/CMakeLists.txt
View File

@@ -54,10 +54,8 @@ ADD_LIBRARY(${LIB_NAME}
Value.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

5
src/osgManipulator/CMakeLists.txt
View File

@@ -57,12 +57,11 @@ ADD_LIBRARY(${LIB_NAME}
TranslatePlaneDragger.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osgGA
osgUtil
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

5
src/osgParticle/CMakeLists.txt
View File

@@ -76,12 +76,11 @@ ADD_LIBRARY(${LIB_NAME}
Version.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osgUtil
osgDB
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

5
src/osgShadow/CMakeLists.txt
View File

@@ -33,12 +33,11 @@ ADD_LIBRARY(${LIB_NAME}
Version.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osgUtil
osgDB
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

5
src/osgSim/CMakeLists.txt
View File

@@ -63,12 +63,11 @@ ADD_LIBRARY(${LIB_NAME}
VisibilityGroup.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osgText
osgUtil
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

9
src/osgTerrain/CMakeLists.txt
View File

@@ -28,13 +28,12 @@ ADD_LIBRARY(${LIB_NAME}
Version.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
osg
osgDB
LINK_INTERNAL(${LIB_NAME}
osgUtil
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
osgDB
osg
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

5
src/osgText/CMakeLists.txt
View File

@@ -29,11 +29,10 @@ ADD_LIBRARY(${LIB_NAME}
Version.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osgDB
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

5
src/osgUtil/CMakeLists.txt
View File

@@ -80,10 +80,9 @@ ADD_LIBRARY(${LIB_NAME}
Version.cpp
)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)

9
src/osgViewer/CMakeLists.txt
View File

@@ -72,20 +72,19 @@ ENDIF(WIN32)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_INTERNAL(${LIB_NAME}
osgGA
osgText
osgDB
osgUtil
osg
${OPENTHREADS_LIBRARY}
${OPENGL_LIBRARIES}
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
IF(MINGW)
TARGET_LINK_LIBRARIES(${LIB_NAME}
LINK_EXTERNAL(${LIB_NAME}
gdi32
)
)
ENDIF(MINGW)
INCLUDE(ModuleInstall OPTIONAL)