[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-20 11:38:36
Message-ID: 1211283516.169257.13174.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 810282 by mlaurent:

Sync version


 M  +16 -7     FindCLucene.cmake  


--- trunk/KDE/kdebase/runtime/cmake/modules/FindCLucene.cmake \
#810281:810282 @@ -12,6 +12,15 @@
 INCLUDE(CheckSymbolExists)
 INCLUDE(FindLibraryWithDebug)
 
+if(NOT CLUCENE_MIN_VERSION)
+  set(CLUCENE_MIN_VERSION "0.9.16")
+endif(NOT CLUCENE_MIN_VERSION)
+
+if(NOT CLUCENE_MAX_SUPPORTED_VERSION)
+  set(CLUCENE_MAX_SUPPORTED_VERSION "0.9.17")
+endif(NOT CLUCENE_MAX_SUPPORTED_VERSION)
+
+
 IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
 ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
@@ -50,19 +59,19 @@
   ENDIF(WIN32)
 
   FIND_PATH(CLUCENE_LIBRARY_DIR
-      NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} \
${TRIAL_INCLUDE_PATHS}) +      NAMES CLucene/clucene-config.h PATHS \
${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)  IF \
(CLUCENE_LIBRARY_DIR)  MESSAGE(STATUS "Found CLucene library dir: \
${CLUCENE_LIBRARY_DIR}")  FILE(READ \
${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)  STRING(REGEX \
MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})  IF (CLMATCH)
       STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION \
                ${CLMATCH})
-	  IF (CLUCENE_VERSION STRLESS "0.9.16")
-	    MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the \
                required minimum 0.9.16")
-	  ENDIF (CLUCENE_VERSION STRLESS "0.9.16")
-	  IF (CLUCENE_VERSION STREQUAL "0.9.17")
-	    MESSAGE(FATAL_ERROR "CLucene version 0.9.17 is not supported.")
-	  ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
+	  IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+	    MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the \
required minimum ${CLUCENE_MIN_VERSION}") +	  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.") +	  ENDIF \
(CLUCENE_VERSION STREQUAL "${CLUCENE_MAX_SUPPORTED_VERSION}")  ENDIF \
(CLMATCH)  ENDIF (CLUCENE_LIBRARY_DIR)
 


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