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

Fixed gif plugin entry so that it uses GIFLIB_ rather than GIF to match it up

Browse Source 
to the CMakeModels/FindGIFLIB.cmake entry
This commit is contained in:
Robert Osfield 2007-03-13 11:58:52 +00:00
parent 52371293b0
commit 386f3a091e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/CMakeLists.txt
View File

@ -46,9 +46,9 @@ IF (BUILD_OSG_IMAGE_PLUGINS)
IF(JPEG_FOUND)
SUBDIRS( jpeg )
ENDIF(JPEG_FOUND)
IF(GIF_FOUND)
IF(GIFLIB_FOUND)
SUBDIRS( gif )
ENDIF(GIF_FOUND)
ENDIF(GIFLIB_FOUND)
IF(PNG_FOUND)
SUBDIRS( png )
ENDIF(PNG_FOUND)

7
src/osgPlugins/gif/CMakeLists.txt
View File

@ -1,8 +1,7 @@
INCLUDE_DIRECTORIES( ${GIF_INCLUDE_DIR} )
LINK_DIRECTORIES( ${GIF_DIR}/lib )
INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
LINK_DIRECTORIES( ${GIFLIB_DIR}/lib )
IF(NOT MINGW)
ADD_OSG_PLUGIN(gif ${GIF_LIBRARY})
ADD_OSG_PLUGIN(gif ${GIFLIB_LIBRARY})
ENDIF(NOT MINGW)
IF(MSVC)
SET_TARGET_PROPERTIES(osgdb_gif PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")