From af3bb09cfeb60aeda554754f13a939d14e4bbd4e Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 16 Sep 2020 20:29:23 +0200 Subject: Lowercase Findxapian module (same casing as upstream xapian-core) --- addon/doxysearch/CMakeLists.txt | 2 +- cmake/FindXapian.cmake | 42 ----------------------------------------- cmake/Findxapian.cmake | 42 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 cmake/FindXapian.cmake create mode 100644 cmake/Findxapian.cmake diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt index dd3258d..459d17a 100644 --- a/addon/doxysearch/CMakeLists.txt +++ b/addon/doxysearch/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(Xapian REQUIRED) +find_package(xapian REQUIRED) find_package(ZLIB REQUIRED) if (WIN32) diff --git a/cmake/FindXapian.cmake b/cmake/FindXapian.cmake deleted file mode 100644 index 6109d7f..0000000 --- a/cmake/FindXapian.cmake +++ /dev/null @@ -1,42 +0,0 @@ -# Find Xapian search engine library -# -# XAPIAN_FOUND - system has Xapian -# XAPIAN_INCLUDE_DIR - the Xapian include directory -# XAPIAN_LIBRARIES - the libraries needed to use Xapian -# -# Copyright © 2010 Harald Sitter -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) - # Already in cache, be silent - set(Xapian_FIND_QUIETLY TRUE) -endif(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) - -FIND_PATH(XAPIAN_INCLUDE_DIR xapian/version.h) - -FIND_LIBRARY(XAPIAN_LIBRARIES NAMES xapian) - -IF(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) - SET(XAPIAN_FOUND TRUE) -ELSE(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) - SET(XAPIAN_FOUND FALSE) -ENDIF(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) - -IF(XAPIAN_FOUND) - IF(NOT Xapian_FIND_QUIETLY) - MESSAGE(STATUS "Found Xapian: ${XAPIAN_LIBRARIES}") - ENDIF(NOT Xapian_FIND_QUIETLY) -ELSE(XAPIAN_FOUND) - IF(Xapian_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Xapian") - ENDIF(Xapian_FIND_REQUIRED) - IF(NOT Xapian_FIND_QUIETLY) - MESSAGE(STATUS "Could not find Xapian") - ENDIF(NOT Xapian_FIND_QUIETLY) -ENDIF(XAPIAN_FOUND) - -# show the XAPIAN_INCLUDE_DIR and XAPIAN_LIBRARIES variables only in the advanced view -MARK_AS_ADVANCED(XAPIAN_INCLUDE_DIR XAPIAN_LIBRARIES) - diff --git a/cmake/Findxapian.cmake b/cmake/Findxapian.cmake new file mode 100644 index 0000000..33726cf --- /dev/null +++ b/cmake/Findxapian.cmake @@ -0,0 +1,42 @@ +# Find xapian search engine library +# +# XAPIAN_FOUND - system has Xapian +# XAPIAN_INCLUDE_DIR - the Xapian include directory +# XAPIAN_LIBRARIES - the libraries needed to use Xapian +# +# Copyright © 2010 Harald Sitter +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + # Already in cache, be silent + set(xapian_FIND_QUIETLY TRUE) +endif(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + +FIND_PATH(XAPIAN_INCLUDE_DIR xapian/version.h) + +FIND_LIBRARY(XAPIAN_LIBRARIES NAMES xapian) + +IF(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + SET(XAPIAN_FOUND TRUE) +ELSE(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + SET(XAPIAN_FOUND FALSE) +ENDIF(XAPIAN_INCLUDE_DIR AND XAPIAN_LIBRARIES) + +IF(XAPIAN_FOUND) + IF(NOT xapian_FIND_QUIETLY) + MESSAGE(STATUS "Found xapian: ${XAPIAN_LIBRARIES}") + ENDIF(NOT xapian_FIND_QUIETLY) +ELSE(XAPIAN_FOUND) + IF(xapian_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find xapian") + ENDIF(xapian_FIND_REQUIRED) + IF(NOT xapian_FIND_QUIETLY) + MESSAGE(STATUS "Could not find xapian") + ENDIF(NOT xapian_FIND_QUIETLY) +ENDIF(XAPIAN_FOUND) + +# show the XAPIAN_INCLUDE_DIR and XAPIAN_LIBRARIES variables only in the advanced view +MARK_AS_ADVANCED(XAPIAN_INCLUDE_DIR XAPIAN_LIBRARIES) + -- cgit v0.12