diff --git a/CMakeLists.txt b/CMakeLists.txt index 29916f8b3..4957d5882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -247,9 +247,6 @@ endif() macro_optional_find_package(Echonest 2.2.0) macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.2.0 is needed for dynamic playlists and the infosystem") -macro_optional_find_package(CLucene 0.9.23) -macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection") - macro_optional_find_package(Lucene++ 3.0.0) macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection") diff --git a/CMakeModules/FindCLucene.cmake b/CMakeModules/FindCLucene.cmake deleted file mode 100644 index 873693d8c..000000000 --- a/CMakeModules/FindCLucene.cmake +++ /dev/null @@ -1,132 +0,0 @@ -# -# This module looks for clucene (http://clucene.sf.net) support -# It will define the following values -# -# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR -# CLUCENE_INCLUDE_DIR = where CLucene/StdHeader.h can be found -# CLUCENE_LIBRARY_DIR = where CLucene/clucene-config.h can be found -# CLUCENE_LIBRARIES = the libraries to link against CLucene -# CLUCENE_VERSION = The CLucene version string -# CLucene_FOUND = set to 1 if clucene is found -# - -INCLUDE(CheckSymbolExists) -INCLUDE(FindLibraryWithDebug) - -# try to locate a patched unstable version (for comp's sake *sigh*) first -FIND_PACKAGE(CLuceneUnstable QUIET) -IF(CLUCENEUNSTABLE_FOUND) - SET(CLucene_FOUND TRUE) - SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS}) - SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR}) - SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS}) - - #MESSAGE(FATAL_ERROR NARF) -ELSE(CLUCENEUNSTABLE_FOUND) -IF(CLucene_FIND_VERSION) - SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION}) -ELSEIF() - SET(CLUCENE_MIN_VERSION "0.9.23") -ENDIF(CLucene_FIND_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} - /usr/pkg/lib${LIB_SUFFIX} - /usr/lib64 - /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} - ) -SET(TRIAL_INCLUDE_PATHS - $ENV{CLUCENE_HOME}/include - ${CMAKE_INSTALL_PREFIX}/include - /usr/local/include - /usr/include - /sw/include - /usr/pkg/include - ) -FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY - WIN32_DEBUG_POSTFIX d - NAMES clucene-core - PATHS ${TRIAL_LIBRARY_PATHS}) -IF (CLUCENE_CORE_LIBRARY) - MESSAGE(STATUS "Found CLucene core library: ${CLUCENE_CORE_LIBRARY}") -ENDIF (CLUCENE_CORE_LIBRARY) -FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIBRARY - WIN32_DEBUG_POSTFIX d - NAMES clucene-shared - PATHS ${TRIAL_LIBRARY_PATHS}) -IF (CLUCENE_SHARED_LIBRARY) - MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}") -ENDIF (CLUCENE_SHARED_LIBRARY) - -IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY) - SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRARY}) -ENDIF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_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 CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake - PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH) -IF (CLUCENE_LIBRARY_DIR) - MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}") - # include CLuceneConfig/CLuceneConfig.cmake - IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake) - INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake) - ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake) - # include CLucene/CLuceneConfig.cmake - IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake) - INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake) - ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake) - 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 (CLUCENE_LIBRARY_DIR) - -IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION) - SET(CLucene_FOUND TRUE) - SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR}) -ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION) - -ENDIF(CLUCENEUNSTABLE_FOUND) - -IF(CLucene_FOUND) - IF(NOT CLucene_FIND_QUIETLY) - MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}") - ENDIF(NOT CLucene_FIND_QUIETLY) -ELSE(CLucene_FOUND) - IF(CLucene_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find CLucene.") - ENDIF(CLucene_FIND_REQUIRED) -ENDIF(CLucene_FOUND) - -MARK_AS_ADVANCED( - CLUCENE_INCLUDE_DIRS - CLUCENE_INCLUDE_DIR - CLUCENE_LIBRARY_DIR - CLUCENE_LIBRARIES - ) diff --git a/CMakeModules/FindCLuceneUnstable.cmake b/CMakeModules/FindCLuceneUnstable.cmake deleted file mode 100644 index 62643aa86..000000000 --- a/CMakeModules/FindCLuceneUnstable.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# - Try to find clucene-unstable -# This is a workaround for distros, that want to ship a recent enough clucene but don't want to replace the old version -# -# CLUCENEUNSTABLE_FOUND - system has clucene-unstable -# CLUCENE_UNSTABLE_INCLUDE_DIR - the clucene-unstable include directories -# CLUCENE_UNSTABLE_LIBS - link these to use clucene-unstable -# -# (c) Dominik Schmidt -# - -# Include dir -find_path(CLUCENE_UNSTABLE_INCLUDE_DIR - NAMES CLucene.h - PATH_SUFFIXES clucene-unstable - PATHS ${KDE4_INCLUDE_DIR} -) - -# Finally the library itself -find_library(CLUCENE_UNSTABLE_SHARED_LIB - NAMES clucene-unstable-shared - PATHS ${KDE4_LIB_DIR} -) - -find_library(CLUCENE_UNSTABLE_CORE_LIB - NAMES clucene-unstable-core - PATHS ${KDE4_LIB_DIR} -) - - -SET( CLUCENE_UNSTABLE_LIBS ${CLUCENE_UNSTABLE_SHARED_LIB} ${CLUCENE_UNSTABLE_CORE_LIB} ) -SET( CLUCENE_UNSTABLE_INCLUDE_DIRS ${CLUCENE_UNSTABLE_INCLUDE_DIR}) -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLuceneUnstable DEFAULT_MSG CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS) - - -MARK_AS_ADVANCED(CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS) -