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,

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

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)