diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-12 14:38:04 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-12 14:38:04 +0000 |
| commit | 75a07dd38b4a491a9d16d24492bea5c6ba90a8ff (patch) | |
| tree | 0a65094e22bba335545b8ffe4a33fe7790edb21c /modules/FindGIF.cmake | |
| parent | bce40e0de3b22a291ecaa2b75358e6a998e1579b (diff) | |
| download | extra-cmake-modules-75a07dd38b4a491a9d16d24492bea5c6ba90a8ff.tar.gz extra-cmake-modules-75a07dd38b4a491a9d16d24492bea5c6ba90a8ff.tar.bz2 | |
-moved the cmake code to find kdewin32 out of FindKDE4.cmake and into its own FindKDEWIN32.cmake file
-added a new FindGNUWIN32.cmake file, which tries to find the gnuwin32 base directory
-changed all "FOO_LIBRARY" variable names to "FOO_LIBRARIES" to be more consistent with the other cmake modules
-added a macro_getenv_win_path() which replaces all backslahes with slashes from environment variables
-modified the kde4_add_kcfg_files() command, so that the generated header is also processed by moc
-all tests compile and link
Alex
CCMAIL:kde-buildsystem@kde.org
The changes to the windows stuff are untested, since I don't have a windows box.
Please check that everything still works. Please have a look at FindGNUWIN32.cmake,
there are probably ways to improve this. The resulting GNUWIN32_DIR variable is used in other
cmake modules as default path to search for headers and libraries.
svn path=/trunk/KDE/kdelibs/; revision=508648
Diffstat (limited to 'modules/FindGIF.cmake')
| -rw-r--r-- | modules/FindGIF.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake index b1dc4a57..94e75388 100644 --- a/modules/FindGIF.cmake +++ b/modules/FindGIF.cmake @@ -3,7 +3,7 @@ # # GIF_FOUND - system has GIF # GIF_INCLUDE_DIR - the GIF include directory -# GIF_LIBRARY - Link these to use OpenGL and GLU +# GIF_LIBRARIES - Libraries needed to use GIF # GIF_DEFINITIONS - Compiler switches required for using GIF # @@ -13,19 +13,19 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h /usr/local/include ) -FIND_LIBRARY(GIF_LIBRARY NAMES gif libgif ungif libungif giflib +FIND_LIBRARY(GIF_LIBRARIES NAMES gif libgif ungif libungif giflib PATHS /usr/lib /usr/local/lib ) -IF(GIF_INCLUDE_DIR AND GIF_LIBRARY) +IF(GIF_INCLUDE_DIR AND GIF_LIBRARIES) SET(GIF_FOUND TRUE) -ENDIF(GIF_INCLUDE_DIR AND GIF_LIBRARY) +ENDIF(GIF_INCLUDE_DIR AND GIF_LIBRARIES) IF(GIF_FOUND) IF(NOT GIF_FIND_QUIETLY) - MESSAGE(STATUS "Found GIF: ${GIF_LIBRARY}") + MESSAGE(STATUS "Found GIF: ${GIF_LIBRARIES}") ENDIF(NOT GIF_FIND_QUIETLY) ELSE(GIF_FOUND) IF(GIF_FIND_REQUIRED) @@ -33,3 +33,4 @@ ELSE(GIF_FOUND) ENDIF(GIF_FIND_REQUIRED) ENDIF(GIF_FOUND) +MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARIES) |