[Kde-bindings] KDE/kdebindings

[Richard Dale]

SVN commit 677985 by rdale:

* Added an improved cmake module for finding the Qwt lib
  from Pau Garcia i Quiles with some small changes

CCMAIL: kde-bindings at kde.org



 D             cmake/modules/FindQwt.cmake  
 A             cmake/modules/FindQwt5.cmake  
 M  +5 -5      smoke/qt/CMakeLists.txt  
 M  +4 -4      smoke/qt/generate.pl.cmake  


--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #677984:677985
@@ -1,6 +1,6 @@
 
 include(FindQScintilla)
-include(FindQwt)
+include(FindQwt5)
 
 include_directories( ${QT_INCLUDES}  ${CMAKE_CURRENT_SOURCE_DIR}/../ )
 
@@ -8,9 +8,9 @@
     include_directories( ${QSCINTILLA_INCLUDE_DIR} )
 endif(QSCINTILLA_FOUND)
 
-if(QWT_FOUND)
-    include_directories( ${QWT_INCLUDE_DIR} )
-endif(QWT_FOUND)
+if(Qwt5_Qt4_FOUND)
+    include_directories( ${Qwt5_INCLUDE_DIR} )
+endif(Qwt5_Qt4_FOUND)
 
 IF(NOT PERL_FOUND)
     FIND_PACKAGE(PERL REQUIRED)
@@ -121,7 +121,7 @@
                               ${QT_QTUITOOLS_LIBRARY}
                               ${QT_QTXML_LIBRARY}
                               ${QSCINTILLA_LIBRARIES} 
-                              ${QWT_LIBRARIES} )
+                              ${Qwt5_Qt4_LIBRARY} )
 
 set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
--- trunk/KDE/kdebindings/smoke/qt/generate.pl.cmake #677984:677985
@@ -27,7 +27,7 @@
  $qscintilla_headerlistpath = "$here/$qscintilla_headerlist";
 }
 
-if("@QWT_FOUND@" eq "YES")
+if("@Qwt5_Qt4_FOUND@" eq "TRUE")
 {
  $qwt_headerlist = "@CMAKE_CURRENT_SOURCE_DIR@/qwt_header_list";
  $qwt_headerlistpath = "$here/$qwt_headerlist";
@@ -40,7 +40,7 @@
  $qscintilla_headerlistpath = $qscintilla_headerlist if ($qscintilla_headerlist =~ /^\//);
 }
 
-if("@QWT_FOUND@" eq "YES")
+if("@Qwt5_Qt4_FOUND@" eq "TRUE")
 {
  $qwt_headerlistpath = $qwt_headerlist if ($qwt_headerlist =~ /^\//);
 }
@@ -108,7 +108,7 @@
 }
 
 my %qwt_includes;
-if("@QWT_FOUND@" eq "YES")
+if("@Qwt5_Qt4_FOUND@" eq "TRUE")
 {
  open(HEADERS, $qwt_headerlistpath) or die "Couldn't open $qwt_headerlistpath: $!\n";
  map { chomp ; $qwt_includes{$_} = 1 } <HEADERS>;
@@ -168,7 +168,7 @@
     }, @qtinc
  );
 
-$qwtinc = '@QWT_INCLUDE_DIR@';
+$qwtinc = '@Qwt5_INCLUDE_DIR@';
 
 find(
     {   wanted => sub {