From 386f3a091e856b66f51aa7ae770f2aa40429b44c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 13 Mar 2007 11:58:52 +0000 Subject: [PATCH] Fixed gif plugin entry so that it uses GIFLIB_ rather than GIF to match it up to the CMakeModels/FindGIFLIB.cmake entry --- src/osgPlugins/CMakeLists.txt | 4 ++-- src/osgPlugins/gif/CMakeLists.txt | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt index dfd8f0ba6..6c7d364b1 100644 --- a/src/osgPlugins/CMakeLists.txt +++ b/src/osgPlugins/CMakeLists.txt @@ -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) diff --git a/src/osgPlugins/gif/CMakeLists.txt b/src/osgPlugins/gif/CMakeLists.txt index 0292064a0..92ed0d791 100644 --- a/src/osgPlugins/gif/CMakeLists.txt +++ b/src/osgPlugins/gif/CMakeLists.txt @@ -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")