mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Merged FindCLucene fix.

Browse Source
This commit is contained in:
Dominik Schmidt
2011-11-23 06:35:39 +01:00
committed by Christian Muehlhaeuser
parent a0cda5cce6
commit 6172ef3df4
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeModules/FindCLucene.cmake
View File

@@ -2,6 +2,7 @@
# This module looks for clucene (http://clucene.sf.net) support # This module looks for clucene (http://clucene.sf.net) support
# It will define the following values # 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_INCLUDE_DIR = where CLucene/StdHeader.h can be found
# CLUCENE_LIBRARY_DIR = where CLucene/clucene-config.h can be found # CLUCENE_LIBRARY_DIR = where CLucene/clucene-config.h can be found
# CLUCENE_LIBRARIES = the libraries to link against CLucene # CLUCENE_LIBRARIES = the libraries to link against CLucene
@@ -17,6 +18,7 @@ FIND_PACKAGE(CLuceneUnstable)
IF(CLUCENEUNSTABLE_FOUND) IF(CLUCENEUNSTABLE_FOUND)
SET(CLucene_FOUND TRUE) SET(CLucene_FOUND TRUE)
SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS}) SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS}) SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
#MESSAGE(FATAL_ERROR NARF) #MESSAGE(FATAL_ERROR NARF)
@@ -106,7 +108,9 @@ ENDIF (CLUCENE_LIBRARY_DIR)
IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION) IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
SET(CLucene_FOUND TRUE) 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(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
ENDIF(CLUCENEUNSTABLE_FOUND) ENDIF(CLUCENEUNSTABLE_FOUND)
IF(CLucene_FOUND) IF(CLucene_FOUND)
@@ -120,7 +124,8 @@ ELSE(CLucene_FOUND)
ENDIF(CLucene_FOUND) ENDIF(CLucene_FOUND)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
CLUCENE_INCLUDE_DIR CLUCENE_INCLUDE_DIRS
CLUCENE_LIBRARY_DIR CLUCENE_INCLUDE_DIR
CLUCENE_LIBRARY_DIR
CLUCENE_LIBRARIES CLUCENE_LIBRARIES
) )

2
src/libtomahawk/CMakeLists.txt
View File

@@ -525,7 +525,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.
${QJSON_INCLUDE_DIR} ${QJSON_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR} ${LIBECHONEST_INCLUDE_DIR}
${LIBECHONEST_INCLUDE_DIR}/.. ${LIBECHONEST_INCLUDE_DIR}/..
${CLUCENE_INCLUDE_DIR} {CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIRS}
${PHONON_INCLUDES} ${PHONON_INCLUDES}
${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src