From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sun, 18 Sep 2016 00:33:13 +0000 (+0000)
Subject: generic: make Strigi recommended
X-Git-Tag: 4.22.0~1418
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e8801340eafb15c48881f26bb195abcd520c4b3a;p=kde%2Fkde-workspace.git

generic: make Strigi recommended

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1208bed..1fba80d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,14 @@ set_package_properties(DBusMenuQt PROPERTIES
     TYPE RECOMMENDED
 )
 
+macro_optional_find_package(Strigi 0.6.3)
+set_package_properties(Strigi PROPERTIES
+    DESCRIPTION "Desktop indexing and search support"
+    URL "http://strigi.sourceforge.net"
+    TYPE RECOMMENDED
+    PURPOSE "Required for fonts analyzer"
+)
+
 macro_optional_find_package(OpenGL)
 set_package_properties(OpenGL PROPERTIES
     DESCRIPTION "The OpenGL libraries"
diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/CMakeLists.txt
index 8a12a3fb..254b5313 100644
--- a/kcontrol/kfontinst/CMakeLists.txt
+++ b/kcontrol/kfontinst/CMakeLists.txt
@@ -27,8 +27,10 @@ if (X11_Xft_FOUND)
 
     add_subdirectory( lib ) 
     add_subdirectory( dbus )
-    add_subdirectory( kcmfontinst ) 
-    add_subdirectory( strigi-analyzer )
+    add_subdirectory( kcmfontinst )
+    if (STRIGI_FOUND)
+        add_subdirectory( strigi-analyzer )
+    endif()
     add_subdirectory( apps )
     add_subdirectory( kio ) 
     add_subdirectory( thumbnail )
diff --git a/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt b/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
index 6ab50c90..59fab1ea 100644
--- a/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
+++ b/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
@@ -1,10 +1,17 @@
-include_directories( ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib/
-                     ${STRIGI_INCLUDE_DIR}
-                   )
+include_directories(
+    ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib/
+    ${STRIGI_INCLUDE_DIR}
+)
 
-add_library(font MODULE FontThroughAnalyzer.cpp FontEngine.cpp )
+add_library(font MODULE FontThroughAnalyzer.cpp FontEngine.cpp)
 
-target_link_libraries(font ${STRIGI_STREAMANALYZER_LIBRARY} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${KDE4_KIO_LIBS} kfontinst)
+target_link_libraries(font
+    ${STRIGI_STREAMANALYZER_LIBRARY}
+    ${FREETYPE_LIBRARIES}
+    ${FONTCONFIG_LIBRARIES}
+    ${KDE4_KIO_LIBS}
+    kfontinst
+)
 
 set_target_properties(font PROPERTIES  PREFIX strigita_)