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/FindJasper.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/FindJasper.cmake')
| -rw-r--r-- | modules/FindJasper.cmake | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake index 5e86c1ca..5eff452e 100644 --- a/modules/FindJasper.cmake +++ b/modules/FindJasper.cmake @@ -1,27 +1,35 @@ +# - Try to find the Jasper JPEG2000 library +# Once done this will define +# +# JASPER_FOUND - system has Jasper +# JASPER_INCLUDE_DIR - the Jasper include directory +# JASPER_LIBRARIES - The libraries needed to use Jasper FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h -/usr/include -/usr/local/include + /usr/include + /usr/local/include ) -FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper -PATHS -/usr/lib -/usr/local/lib +FIND_LIBRARY(JASPER_LIBRARIES NAMES jasper libjasper + PATHS + /usr/lib + /usr/local/lib ) -IF(JASPER_INCLUDE_DIR AND JASPER_LIBRARY) +IF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES) SET(JASPER_FOUND TRUE) -ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARY) +ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES) IF(JASPER_FOUND) IF(NOT Jasper_FIND_QUIETLY) - MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARY}") + MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARIES}") ENDIF(NOT Jasper_FIND_QUIETLY) ELSE(JASPER_FOUND) IF(Jasper_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could not find jasper library") ENDIF(Jasper_FIND_REQUIRED) ENDIF(JASPER_FOUND) + +MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES) |