diff options
| author | Tuomas Suutari <thsuut@utu.fi> | 2007-08-20 12:54:23 +0000 |
|---|---|---|
| committer | Tuomas Suutari <thsuut@utu.fi> | 2007-08-20 12:54:23 +0000 |
| commit | f73e58154385cbf67296ba52c616d37164340eb0 (patch) | |
| tree | 2e74c2b031ff9cea7fb1420df507b831a79cdcf8 | |
| parent | 2f57dbc1a730680bdf1376a61a83c14b78245b8b (diff) | |
| download | extra-cmake-modules-f73e58154385cbf67296ba52c616d37164340eb0.tar.gz extra-cmake-modules-f73e58154385cbf67296ba52c616d37164340eb0.tar.bz2 | |
When finding an optional library don't fail if old version is
found. Just mark as not found.
Will still fail at the end if finding a required library.
svn path=/trunk/KDE/kdelibs/; revision=702344
| -rw-r--r-- | modules/FindKdcraw.cmake | 4 | ||||
| -rw-r--r-- | modules/FindKexiv2.cmake | 4 | ||||
| -rw-r--r-- | modules/FindKipi.cmake | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/modules/FindKdcraw.cmake b/modules/FindKdcraw.cmake index b9cca05e..ebd37382 100644 --- a/modules/FindKdcraw.cmake +++ b/modules/FindKdcraw.cmake @@ -48,7 +48,9 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) message(STATUS "Found libkdcraw release >= 0.2.0") set(KDCRAW_VERSION_GOOD_FOUND TRUE) else(_return_VALUE STREQUAL "0") - message(FATAL_ERROR "Found libkdcaw release < 0.2.0") + message(STATUS "Found libkdcaw release < 0.2.0, too old") + set(KDCRAW_VERSION_GOOD_FOUND FALSE) + set(KDCRAW_FOUND FALSE) endif(_return_VALUE STREQUAL "0") else(_KDCRAWLinkFlags) set(KDCRAW_VERSION_GOOD_FOUND FALSE) diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index f9d73ce1..3365d7e1 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -48,7 +48,9 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) message(STATUS "Found libkexiv2 release >= 0.2.0") set(KEXIV2_VERSION_GOOD_FOUND TRUE) else(_return_VALUE STREQUAL "0") - message(FATAL_ERROR "Found libkexiv2 release < 0.2.0") + message(STATUS "Found libkexiv2 release < 0.2.0, too old") + set(KEXIV2_VERSION_GOOD_FOUND FALSE) + set(KEXIV2_FOUND FALSE) endif(_return_VALUE STREQUAL "0") else(_KEXIV2LinkFlags) set(KEXIV2_VERSION_GOOD_FOUND FALSE) diff --git a/modules/FindKipi.cmake b/modules/FindKipi.cmake index 15e2643e..bde22e50 100644 --- a/modules/FindKipi.cmake +++ b/modules/FindKipi.cmake @@ -49,7 +49,9 @@ else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) message(STATUS "Found libkipi release >= 0.2.0") set(KIPI_VERSION_GOOD_FOUND TRUE) else(_return_VALUE STREQUAL "0") - message(FATAL_ERROR "Found libkipi release < 0.2.0") + message(STATUS "Found libkipi release < 0.2.0, too old") + set(KIPI_VERSION_GOOD_FOUND FALSE) + set(KIPI_FOUND FALSE) endif(_return_VALUE STREQUAL "0") else(_KIPILinkFlags) set(KIPI_VERSION_GOOD_FOUND FALSE) |