From 6266a67249206b565250a10073d833d378f36825 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Tue, 16 Sep 2014 11:58:27 +0200 Subject: [PATCH] fixed strange lucene++ find script for windows --- CMakeModules/FindLucene++.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeModules/FindLucene++.cmake b/CMakeModules/FindLucene++.cmake index 4a214b3ac..2a005df3e 100644 --- a/CMakeModules/FindLucene++.cmake +++ b/CMakeModules/FindLucene++.cmake @@ -22,6 +22,7 @@ ENDIF(LUCENEPP_FIND_VERSION) SET(TRIAL_LIBRARY_PATHS $ENV{LUCENEPP_HOME}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} + ${CMAKE_INSTALL_PREFIX}/lib /usr/local/lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX} /sw/lib${LIB_SUFFIX} @@ -64,14 +65,10 @@ IF (LUCENEPP_INCLUDE_DIR) MESSAGE(STATUS "Found Lucene++ include dir: ${LUCENEPP_INCLUDE_DIR}") ENDIF (LUCENEPP_INCLUDE_DIR) -IF(WIN32) - SET(TRIAL_LIBRARY_PATHS ${LUCENEPP_INCLUDE_DIR}) -ENDIF(WIN32) - SET(LUCENEPP_GOOD_VERSION TRUE) FIND_PATH(LUCENEPP_LIBRARY_DIR - NAMES liblucene++.dylib liblucene++.so liblucene++.dll + NAMES liblucene++.dylib liblucene++.so liblucene++.dll.a PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH) IF (LUCENEPP_LIBRARY_DIR) MESSAGE(STATUS "Found Lucene++ library dir: ${LUCENEPP_LIBRARY_DIR}")