* Merged FindCLucene fix.

CMakeModules/FindCLucene.cmake

@@ -2,6 +2,7 @@
 # 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
@@ -17,6 +18,7 @@ FIND_PACKAGE(CLuceneUnstable)
 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)
@@ -106,7 +108,9 @@ 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)
@@ -120,7 +124,8 @@ ELSE(CLucene_FOUND)
 ENDIF(CLucene_FOUND)
 
 MARK_AS_ADVANCED(
-  CLUCENE_INCLUDE_DIR 
-  CLUCENE_LIBRARY_DIR 
+  CLUCENE_INCLUDE_DIRS
+  CLUCENE_INCLUDE_DIR
+  CLUCENE_LIBRARY_DIR
   CLUCENE_LIBRARIES
   )

src/libtomahawk/CMakeLists.txt

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