[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/cmake/modules
From:       Laurent Montel <montel () kde ! org>
Date:       2008-05-22 11:25:46
Message-ID: 1211455546.796075.20819.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 811133 by mlaurent:

Sync file


 M  +8 -4      FindCLucene.cmake  


--- trunk/KDE/kdebase/runtime/cmake/modules/FindCLucene.cmake #811132:811133
@@ -20,7 +20,9 @@
   set(CLUCENE_MAX_SUPPORTED_VERSION "0.9.17")
 endif(NOT CLUCENE_MAX_SUPPORTED_VERSION)
 
+MESSAGE(STATUS "min version ${CLUCENE_MIN_VERSION}")
 
+
 IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
 ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
@@ -57,7 +59,7 @@
   IF(WIN32)
     SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR})
   ENDIF(WIN32)
-
+  set(CLUCENE_GOOD_VERSION TRUE)
   FIND_PATH(CLUCENE_LIBRARY_DIR
       NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
   IF (CLUCENE_LIBRARY_DIR)
@@ -68,24 +70,26 @@
       STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
 	  IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
 	    MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
+            set(CLUCENE_GOOD_VERSION FALSE)
 	  ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
 	  IF (CLUCENE_VERSION STREQUAL "${CLUCENE_MAX_SUPPORTED_VERSION}")
 	    MESSAGE(FATAL_ERROR "CLucene version ${CLUCENE_MAX_SUPPORTED_VERSION} is not supported.")
+            set(CLUCENE_GOOD_VERSION FALSE)
 	  ENDIF (CLUCENE_VERSION STREQUAL "${CLUCENE_MAX_SUPPORTED_VERSION}")
     ENDIF (CLMATCH)
   ENDIF (CLUCENE_LIBRARY_DIR)
 
-IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR)
+IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
   SET(CLucene_FOUND 1)
   IF(NOT CLucene_FIND_QUIETLY)
     MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}")
   ENDIF(NOT CLucene_FIND_QUIETLY)
-ELSE(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR)
+ELSE(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
   SET(CLucene_FOUND 0)
   IF(CLucene_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Could not find CLucene.")
   ENDIF(CLucene_FIND_REQUIRED)
-ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR)
+ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
 
 MARK_AS_ADVANCED(
   CLUCENE_INCLUDE_DIR 
[prev in list] [next in list] [prev in thread] [next in thread]