From Luigi Calori, "here is a patch to use Mike 3rdParty dependencies

It should not be introusive to any other palatform apart MSVC, but in order to link to debug-specific libs
I had to change plugins CMakeLists to differentiate debug/release linkage, I have used the same macro used in core libs
Now the macro used for plugin and examples linking test for existance of TARGET_LIBRARIES_VARS
that holds the names of the variables that have to be used for linking"
This commit is contained in:
Robert Osfield
2007-03-27 21:44:02 +00:00
parent 90f355bd4e
commit 5c780aada0
10 changed files with 21 additions and 18 deletions

View File

@@ -9,8 +9,8 @@ SET(CMAKE_MODULE_PATH "${OpenSceneGraph_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_
# Mainly for Windows as a convenience. This will find a directory in parallel with the
# OSG source that contains 3rd party headers and libraries.
# Use of relative paths in CMake is ill-advised, but don't know of any alternatives in this case
SET(CMAKE_INCLUDE_PATH "${OpenSceneGraph_SOURCE_DIR}/../3rdParty/include;${CMAKE_INCLUDE_PATH}")
SET(CMAKE_LIBRARY_PATH "${OpenSceneGraph_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}")
#SET(CMAKE_INCLUDE_PATH "${OpenSceneGraph_SOURCE_DIR}/../3rdParty/include;${CMAKE_INCLUDE_PATH}")
#SET(CMAKE_LIBRARY_PATH "${OpenSceneGraph_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}")
IF(USING_OSG_OP_OT_TRIPLE_SET)
SET(CMAKE_INCLUDE_PATH "${OpenSceneGraph_SOURCE_DIR}/../../3rdParty/include;${CMAKE_INCLUDE_PATH}")
SET(CMAKE_LIBRARY_PATH "${OpenSceneGraph_SOURCE_DIR}/../../3rdParty/lib;${CMAKE_LIBRARY_PATH}")
@@ -107,6 +107,9 @@ ENDIF(WIN32)
################################################################################
# 3rd Party Dependency Stuff
IF(MSVC)
INCLUDE(Find3rdPartyDependencies)
ENDIF(MSVC)
# Common to all platforms:
FIND_PACKAGE(FreeType)

View File

@@ -82,13 +82,15 @@ MACRO(SETUP_LINK_LIBRARIES)
ENDFOREACH(LINKLIB)
FOREACH(LINKLIB ${TARGET_LIBRARIES})
TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
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})
TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
ENDFOREACH(LINKLIB)
IF(TARGET_LIBRARIES_VARS)
LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS})
ENDIF(TARGET_LIBRARIES_VARS)
ENDMACRO(SETUP_LINK_LIBRARIES)
############################################################################################

View File

@@ -1,6 +1,6 @@
SET(TARGET_SRC osgGLUTkeyboardmouse.cpp )
SET(TARGET_EXTERNAL_LIBRARIES ${GLUT_glut_LIBRARY} )
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} )
SET(TARGET_LIBRARIES_VARS GLUT_glut_LIBRARY )
#### end var setup ###
SETUP_EXAMPLE(osgGLUTkeyboardmouse)

View File

@@ -1,6 +1,7 @@
SET(TARGET_SRC osgGLUTsimple.cpp )
SET(TARGET_EXTERNAL_LIBRARIES ${GLUT_glut_LIBRARY} )
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} )
SET(TARGET_LIBRARIES_VARS GLUT_glut_LIBRARY )
#### end var setup ###
SETUP_EXAMPLE(osgGLUTsimple)

View File

@@ -1,6 +1,7 @@
SET(TARGET_SRC osgsimpleviewerGLUT.cpp )
SET(TARGET_EXTERNAL_LIBRARIES ${GLUT_glut_LIBRARY} )
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} )
SET(TARGET_LIBRARIES_VARS GLUT_glut_LIBRARY )
#### end var setup ###
SETUP_EXAMPLE(osgsimpleviewerGLUT)

View File

@@ -10,6 +10,6 @@
SET(TARGET_SRC FreeTypeFont.cpp FreeTypeLibrary.cpp ReaderWriterFreeType.cpp )
SET(TARGET_H FreeTypeFont.h FreeTypeLibrary.h )
SET(TARGET_ADDED_LIBRARIES osgText )
SET(TARGET_EXTERNAL_LIBRARIES ${FREETYPE_LIBRARY} )
SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY )
#### end var setup ###
SETUP_PLUGIN(freetype)

View File

@@ -2,11 +2,10 @@
INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
LINK_DIRECTORIES( ${GIFLIB_DIR}/lib )
SET(TARGET_SRC ReaderWriterGIF.cpp )
SET(TARGET_EXTERNAL_LIBRARIES ${GIFLIB_LIBRARY} )
SET(TARGET_LIBRARIES_VARS GIFLIB_LIBRARY )
#### end var setup ###
SETUP_PLUGIN(gif)

View File

@@ -2,10 +2,9 @@
INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
LINK_DIRECTORIES( ${JPEG_DIR}/lib )
SET(TARGET_SRC ReaderWriterJPEG.cpp )
SET(TARGET_EXTERNAL_LIBRARIES ${JPEG_LIBRARY} )
SET(TARGET_LIBRARIES_VARS JPEG_LIBRARY )
#### end var setup ###
SETUP_PLUGIN(jpeg)

View File

@@ -2,11 +2,10 @@
INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
LINK_DIRECTORIES( ${ZLIB_DIR}/lib ${PNG_DIR}/lib )
SET(TARGET_SRC ReaderWriterPNG.cpp )
SET(TARGET_EXTERNAL_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY} )
SET(TARGET_LIBRARIES_VARS PNG_LIBRARY ZLIB_LIBRARY )
#### end var setup ###
SETUP_PLUGIN(png)

View File

@@ -2,10 +2,9 @@
INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} )
LINK_DIRECTORIES( ${TIFF_DIR}/lib )
SET(TARGET_SRC ReaderWriterTIFF.cpp )
SET(TARGET_EXTERNAL_LIBRARIES ${TIFF_LIBRARY} )
SET(TARGET_LIBRARIES_VARS TIFF_LIBRARY)
#### end var setup ###
SETUP_PLUGIN(tiff)