summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-08-07 11:05:07 (GMT)
committerMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-08-07 11:05:07 (GMT)
commit69c91babe0c0f91a748529df3a66088e6f11cef7 (patch)
tree9d8fae6a390e584bcf97c5d35228ff101abeebfc
parent689b53d02a07837b4b84e94983e3e5b8b25652c7 (diff)
Re-enable Strigi analyzer
Based on patch from René J.V. Bertin. REVIEw: 127628
-rw-r--r--CMakeLists.txt9
-rw-r--r--strigi/CMakeLists.txt10
2 files changed, 12 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acfb740..ec6b41a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,14 @@ add_subdirectory(lib)
ecm_optional_add_subdirectory(thumbnailers)
-#ecm_optional_add_subdirectory(strigi)
+find_package(Strigi)
+set_package_properties(Strigi PROPERTIES DESCRIPTION "Provide a strigi analyser for Mobipocket documents"
+ URL "http://strigi.sourceforge.net"
+ TYPE OPTIONAL
+)
+if(STRIGI_STREAMS_LIBRARY)
+ ecm_optional_add_subdirectory(strigi)
+endif()
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/QMobipocketConfig.cmake
DESTINATION ${LIB_INSTALL_DIR}/cmake/QMobipocket )
diff --git a/strigi/CMakeLists.txt b/strigi/CMakeLists.txt
index 41d443f..3b6e867 100644
--- a/strigi/CMakeLists.txt
+++ b/strigi/CMakeLists.txt
@@ -1,7 +1,4 @@
-include_directories(
- ${STRIGI_INCLUDE_DIR}
- ${PROJECT_SOURCE_DIR}/lib
- )
+include_directories(${STRIGI_INCLUDE_DIR})
########### next target ###############
@@ -11,10 +8,11 @@ set(mobianalyzer_SRCS
add_library(mobi MODULE ${mobianalyzer_SRCS})
-target_link_libraries(mobi ${STRIGI_STREAMS_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} Qt5::Core Qt5::Gui qmobipocket)
+target_link_libraries(mobi ${STRIGI_STREAMS_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY}
+ Qt5::Core Qt5::Gui qmobipocket)
# install the module in the right directory so it is picked up
-set_target_properties(mobi PROPERTIES PREFIX ${STRIGI_LINE_ANALYZER_PREFIX})
+set_target_properties(mobi PROPERTIES PREFIX strigila_)
########### install files ###############