branches/KDE/4.4/kdebindings/ruby

[Arno Rehn]

SVN commit 1079272 by arnorehn:

fix compilation of ruby bindings

CCMAIL: alien at slackware.com
CCMAIL: kde-bindings at kde.org
CCMAIL: mueller at kde.org
CCMAIL: kde-packages at kde.org
CCMAIL: release-team at kde.org



 M  +1 -2      akonadi/CMakeLists.txt  
 M  +1 -1      khtml/CMakeLists.txt  
 M  +2 -2      ktexteditor/CMakeLists.txt  
 M  +2 -2      nepomuk/CMakeLists.txt  
 M  +3 -3      nepomuk/nepomukhandlers.cpp  
 M  +2 -2      okular/CMakeLists.txt  
 M  +4 -2      qwt/CMakeLists.txt  


--- branches/KDE/4.4/kdebindings/ruby/akonadi/CMakeLists.txt #1079271:1079272
@@ -10,8 +10,7 @@
     ${RUBY_LIBRARY} 
     ${KDEPIMLIBS_AKONADI_LIBS} 
     ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
-    smokeqt 
-    smokekde 
+    smokeqtcore
     smokeakonadi 
     qtruby4shared)
 set_target_properties(rubyakonadi PROPERTIES PREFIX "" OUTPUT_NAME akonadi)
--- branches/KDE/4.4/kdebindings/ruby/khtml/CMakeLists.txt #1079271:1079272
@@ -2,7 +2,7 @@
 
 set(rubykhtml_LIBRARY_SRC khtml.cpp khtmlhandlers.cpp)
 add_library(rubykhtml MODULE ${rubykhtml_LIBRARY_SRC})
-target_link_libraries(rubykhtml ${KHTML_LIBS} ${RUBY_LIBRARY} smokeqt smokekde smokekhtml qtruby4shared)
+target_link_libraries(rubykhtml ${KHTML_LIBS} ${RUBY_LIBRARY} smokeqtcore smokekdecore smokekhtml qtruby4shared)
 set_target_properties(rubykhtml PROPERTIES PREFIX "" OUTPUT_NAME khtml)
 install(TARGETS rubykhtml DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES khtml.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/khtml)
--- branches/KDE/4.4/kdebindings/ruby/ktexteditor/CMakeLists.txt #1079271:1079272
@@ -7,8 +7,8 @@
 target_link_libraries(rubyktexteditor 
     ${QT_QTCORE_LIBRARY} 
     ${RUBY_LIBRARY} 
-    smokeqt 
-    smokekde 
+    smokeqtcore 
+    smokekdecore 
     smokektexteditor 
     qtruby4shared)
 set_target_properties(rubyktexteditor PROPERTIES PREFIX "" OUTPUT_NAME ktexteditor)
--- branches/KDE/4.4/kdebindings/ruby/nepomuk/CMakeLists.txt #1079271:1079272
@@ -7,9 +7,9 @@
 target_link_libraries(rubynepomuk 
     ${RUBY_LIBRARY} 
     ${NEPOMUK_LIBRARIES}
-    smokeqt 
+    smokeqtcore 
     smokesoprano
-    smokekde 
+    smokekdecore 
     smokenepomuk 
     qtruby4shared)
 set_target_properties(rubynepomuk PROPERTIES PREFIX "" OUTPUT_NAME nepomuk)
--- branches/KDE/4.4/kdebindings/ruby/nepomuk/nepomukhandlers.cpp #1079271:1079272
@@ -20,7 +20,7 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qurl.h>
 
-#include <smoke/qt_smoke.h>
+#include <smoke/qtcore_smoke.h>
 #include <qtruby.h>
 #include <smokeruby.h>
 #include <marshall_macros.h>
@@ -81,8 +81,8 @@
 
             if (key == Qnil) {
                 smokeruby_object  * k = alloc_smokeruby_object( true, 
-                                                                qt_Smoke, 
-                                                                qt_Smoke->idClass("QUrl").index, 
+                                                                qtcore_Smoke, 
+                                                                qtcore_Smoke->idClass("QUrl").index, 
                                                                 keyPtr );
                 key = set_obj_info("Qt::Url", k);
             }
--- branches/KDE/4.4/kdebindings/ruby/okular/CMakeLists.txt #1079271:1079272
@@ -8,8 +8,8 @@
     ${QT_QTCORE_LIBRARY} 
     ${RUBY_LIBRARY} 
     ${OKULAR_LIBRARIES}
-    smokeqt 
-    smokekde 
+    smokeqtcore 
+    smokekdecore 
     smokeokular 
     qtruby4shared)
 set_target_properties(rubyokular PROPERTIES PREFIX "" OUTPUT_NAME okular)
--- branches/KDE/4.4/kdebindings/ruby/qwt/CMakeLists.txt #1079271:1079272
@@ -1,9 +1,11 @@
+find_package(Qwt5 REQUIRED)
+
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
-INCLUDE_DIRECTORIES (${QT_INCLUDES})
+INCLUDE_DIRECTORIES (${QT_INCLUDES} ${Qwt5_INCLUDE_DIR})
 
 set(rubyqwt_LIBRARY_SRC qwt.cpp qwthandlers.cpp)
 add_library(rubyqwt MODULE ${rubyqwt_LIBRARY_SRC})
-target_link_libraries(rubyqwt ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqtcore smokeqwt qtruby4shared)
+target_link_libraries(rubyqwt ${Qwt5_Qt4_LIBRARY} ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqtcore smokeqwt qtruby4shared)
 set_target_properties(rubyqwt PROPERTIES PREFIX "" OUTPUT_NAME qwt)
 install(TARGETS rubyqwt DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES qwt.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qwt)