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:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user