From f73e58154385cbf67296ba52c616d37164340eb0 Mon Sep 17 00:00:00 2001 From: Tuomas Suutari Date: Mon, 20 Aug 2007 12:54:23 +0000 Subject: 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 --- modules/FindKdcraw.cmake | 4 +++- modules/FindKexiv2.cmake | 4 +++- modules/FindKipi.cmake | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'modules') 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) -- cgit v1.2.1