[Kde-bindings] KDE/kdebindings

[Cyrille Berger]

SVN commit 831267 by berger:

* use FindOkular.cmake (if available) to test wether okular is available or not

CCMAIL: kde-bindings at kde.org

 M  +6 -0      CMakeLists.txt  
 M  +4 -4      ruby/CMakeLists.txt  
 M  +2 -2      smoke/CMakeLists.txt  


--- trunk/KDE/kdebindings/CMakeLists.txt #831266:831267
@@ -7,6 +7,7 @@
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 include (MacroLibrary)
+include(MacroOptionalDependPackage)
 include(MacroOptionalAddSubdirectory)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
@@ -19,6 +20,11 @@
 macro_optional_find_package(KdepimLibs)
 macro_optional_find_package(Phonon)
 macro_optional_find_package(QScintilla)
+set( OKULAR_FOUND "no" )
+macro_optional_depend_package(Okular "Okular")
+if(DEPEND_PACKAGE_Okular)
+  macro_optional_find_package(Okular)
+endif(DEPEND_PACKAGE_Okular)
 
 macro_optional_add_subdirectory(smoke)
 macro_optional_add_subdirectory(ruby)
--- trunk/KDE/kdebindings/ruby/CMakeLists.txt #831266:831267
@@ -99,14 +99,14 @@
         add_subdirectory( ktexteditor )
         set(KTEXTEDITOR_ENABLED "yes")
     endif(ENABLE_KTEXTEDITOR_RUBY)
-    if(ENABLE_NEPOMUK_RUBY)
+    if(ENABLE_NEPOMUK_RUBY AND Nepomuk_FOUND)
         add_subdirectory( nepomuk )
         set(NEPOMUK_ENABLED "yes")
-    endif(ENABLE_NEPOMUK_RUBY)
-    if(ENABLE_OKULAR_RUBY)
+    endif(ENABLE_NEPOMUK_RUBY AND Nepomuk_FOUND)
+    if(ENABLE_OKULAR_RUBY AND OKULAR_FOUND)
         add_subdirectory( okular )
         set(OKULAR_ENABLED "yes")
-    endif(ENABLE_OKULAR_RUBY)
+    endif(ENABLE_OKULAR_RUBY AND OKULAR_FOUND)
     if(ENABLE_PLASMA_RUBY)
         add_subdirectory( plasma )
         set(PLASMA_ENABLED "yes")
--- trunk/KDE/kdebindings/smoke/CMakeLists.txt #831266:831267
@@ -96,10 +96,10 @@
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Nepomuk")
     endif(ENABLE_NEPOMUK_SMOKE AND Nepomuk_FOUND)
 
-    if(ENABLE_OKULAR_SMOKE)
+    if(ENABLE_OKULAR_SMOKE AND OKULAR_FOUND)
         add_subdirectory(okular)
         set(SMOKE_ENABLED "${SMOKE_ENABLED}, Okular")
-    endif(ENABLE_OKULAR_SMOKE)
+    endif(ENABLE_OKULAR_SMOKE AND OKULAR_FOUND)
 
 endif(ENABLE_SMOKE)