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/FindCups.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/FindCups.cmake')
| -rw-r--r-- | modules/FindCups.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake index 3fa26686..fa97b6f1 100644 --- a/modules/FindCups.cmake +++ b/modules/FindCups.cmake @@ -1,9 +1,9 @@ -# - Try to find Cups +# - Try to find the Cups printing system # Once done this will define # # CUPS_FOUND - system has Cups # CUPS_INCLUDE_DIR - the Cups include directory -# CUPS_LIBRARY - Link these to use OpenGL and GLU +# CUPS_LIBRARIES - Libraries needed to use Cups # CUPS_DEFINITIONS - Compiler switches required for using Cups # @@ -13,19 +13,19 @@ FIND_PATH(CUPS_INCLUDE_DIR cups/cups.h /usr/local/include ) -FIND_LIBRARY(CUPS_LIBRARY NAMES cups +FIND_LIBRARY(CUPS_LIBRARIES NAMES cups PATHS /usr/lib /usr/local/lib ) -IF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY) +IF(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) SET(CUPS_FOUND TRUE) -ENDIF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY) +ENDIF(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) IF(CUPS_FOUND) IF(NOT Cups_FIND_QUIETLY) - MESSAGE(STATUS "Found Cups: ${CUPS_LIBRARY}") + MESSAGE(STATUS "Found Cups: ${CUPS_LIBRARIES}") ENDIF(NOT Cups_FIND_QUIETLY) ELSE(CUPS_FOUND) IF(Cups_FIND_REQUIRED) @@ -33,3 +33,4 @@ ELSE(CUPS_FOUND) ENDIF(Cups_FIND_REQUIRED) ENDIF(CUPS_FOUND) +MARK_AS_ADVANCED(CUPS_INCLUDE_DIR CUPS_LIBRARIES) |