[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebindings/ruby
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2008-06-30 19:24:50
Message-ID: 1214853890.860808.9418.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 826449 by helio:

- Top CMakeLists contains checks for many required extra kde libraries, so we just \
added proper check for all and decide include or not subdirectory.

 M  +8 -8      CMakeLists.txt  
 M  +0 -2      phonon/CMakeLists.txt  


--- trunk/KDE/kdebindings/ruby/CMakeLists.txt #826448:826449
@@ -56,27 +56,27 @@
         set(QTUITOOLS_ENABLED "yes")
     endif(ENABLE_QTUITOOLS_RUBY)
 
-    if(ENABLE_PHONON_RUBY)
+    if(ENABLE_PHONON_RUBY AND PHONON_FOUND)
         add_subdirectory( phonon )
         set(PHONON_ENABLED "yes")
-    endif(ENABLE_PHONON_RUBY)
-    if(ENABLE_QSCINTILLA_RUBY)
+    endif(ENABLE_PHONON_RUBY AND PHONON_FOUND)
+    if(ENABLE_QSCINTILLA_RUBY AND QSCINTILLA_FOUND)
         add_subdirectory( qscintilla )
         set(QSCINTILLA_ENABLED "yes")
-    endif(ENABLE_QSCINTILLA_RUBY)
+    endif(ENABLE_QSCINTILLA_RUBY AND QSCINTILLA_FOUND)
     if(ENABLE_QWT_RUBY)
         add_subdirectory( qwt )
         set(QWT_ENABLED "yes")
     endif(ENABLE_QWT_RUBY)
-    if(ENABLE_SOPRANO_RUBY)
+    if(ENABLE_SOPRANO_RUBY AND Soprano_FOUND)
         add_subdirectory( soprano )
         set(SOPRANO_ENABLED "yes")
-    endif(ENABLE_SOPRANO_RUBY)
+    endif(ENABLE_SOPRANO_RUBY AND Soprano_FOUND)
 
-    if(ENABLE_AKONADI_RUBY)
+    if(ENABLE_AKONADI_RUBY AND KDEPIMLIBS_FOUND)
         add_subdirectory( akonadi )
         set(AKONADI_ENABLED "yes")
-    endif(ENABLE_AKONADI_RUBY)
+    endif(ENABLE_AKONADI_RUBY AND KDEPIMLIBS_FOUND)
     if(ENABLE_KORUNDUM_RUBY)
         add_subdirectory( korundum )
         set(KORUNDUM_ENABLED "yes")
--- trunk/KDE/kdebindings/ruby/phonon/CMakeLists.txt #826448:826449
@@ -1,5 +1,3 @@
-find_package(Phonon REQUIRED)
-
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} \
${CMAKE_SOURCE_DIR}/ruby/qtruby/src)  
 set(rubyphonon_LIBRARY_SRC phonon.cpp phononhandlers.cpp)


[prev in list] [next in list] [prev in thread] [next in thread]