[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-28 6:38:46
Message-ID: 1211956726.319485.7867.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 813562 by mlaurent:

Sync with kdesupport/strigi/cmake/module


 M  +58 -61    FindCLucene.cmake  


--- trunk/KDE/kdebase/runtime/cmake/modules/FindCLucene.cmake #813561:813562
@@ -13,86 +13,83 @@
 INCLUDE(FindLibraryWithDebug)
 
 if(NOT CLUCENE_MIN_VERSION)
-  set(CLUCENE_MIN_VERSION "0.9.16")
+  set(CLUCENE_MIN_VERSION "0.9.19")
 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)
-
-MESSAGE(STATUS "min version ${CLUCENE_MIN_VERSION}")
-
-
 IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
 ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
 
-  SET(TRIAL_LIBRARY_PATHS
-    $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
-    ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-    /usr/local/lib${LIB_SUFFIX}
-    /usr/lib${LIB_SUFFIX}
-    /sw/lib${LIB_SUFFIX}
+SET(TRIAL_LIBRARY_PATHS
+  $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
+  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+  /usr/local/lib${LIB_SUFFIX}
+  /usr/lib${LIB_SUFFIX}
+  /sw/lib${LIB_SUFFIX}
   )
-  SET(TRIAL_INCLUDE_PATHS
-    $ENV{CLUCENE_HOME}/include
-    ${CMAKE_INSTALL_PREFIX}/include
-    /usr/local/include
-    /usr/include
-    /sw/include
+SET(TRIAL_INCLUDE_PATHS
+  $ENV{CLUCENE_HOME}/include
+  ${CMAKE_INSTALL_PREFIX}/include
+  /usr/local/include
+  /usr/include
+  /sw/include
   )
-  FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
-      WIN32_DEBUG_POSTFIX d
-      NAMES clucene clucene-core
-      PATHS ${TRIAL_LIBRARY_PATHS})
-  IF (CLUCENE_LIBRARY)
-    MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
-  ENDIF (CLUCENE_LIBRARY)
-  FIND_PATH(CLUCENE_INCLUDE_DIR
-      NAMES CLucene.h
-      PATHS ${TRIAL_INCLUDE_PATHS})
+FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
+  WIN32_DEBUG_POSTFIX d
+  NAMES clucene clucene-core
+  PATHS ${TRIAL_LIBRARY_PATHS})
+IF (CLUCENE_LIBRARY)
+  MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
+ENDIF (CLUCENE_LIBRARY)
+FIND_PATH(CLUCENE_INCLUDE_DIR
+  NAMES CLucene.h
+  PATHS ${TRIAL_INCLUDE_PATHS})
 
-  IF (CLUCENE_INCLUDE_DIR)
-    MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}")
-  ENDIF (CLUCENE_INCLUDE_DIR)
-  
-  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)
-    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 "${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)
+  MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}")
+ENDIF (CLUCENE_INCLUDE_DIR)
 
+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)
+  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 "${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 "0.9.17")
+	  MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
+      SET(CLUCENE_GOOD_VERSION FALSE)
+	ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
+  ENDIF (CLMATCH)
+ENDIF (CLUCENE_LIBRARY_DIR)
+
 IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND \
                CLUCENE_GOOD_VERSION)
-  SET(CLucene_FOUND 1)
+  SET(CLucene_FOUND TRUE)
+ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND \
CLUCENE_GOOD_VERSION) +
+IF(CLucene_FOUND)
   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 AND \
                CLUCENE_GOOD_VERSION)
-  SET(CLucene_FOUND 0)
+ELSE(CLucene_FOUND)
   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 AND \
CLUCENE_GOOD_VERSION) +ENDIF(CLucene_FOUND)
 
 MARK_AS_ADVANCED(
   CLUCENE_INCLUDE_DIR 
   CLUCENE_LIBRARY_DIR 
   CLUCENE_LIBRARY 
-)
+  )


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