[Kde-bindings] KDE/kdebindings/smoke

Richard Dale Richard_Dale at tipitina.demon.co.uk
Wed Jun 4 18:48:53 UTC 2008


SVN commit 816755 by rdale:

* Move the various smoke library headers to kdebinding smoke, and install them in the smoke
  directory instead of individual sub-directories under smoke

CCMAIL: kde-bindings at kde.org

 M  +1 -1      akonadi/CMakeLists.txt  
 D             akonadi/akonadi_smoke.h  
 A             akonadi_smoke.h   akonadi/akonadi_smoke.h#816727 [License: UNKNOWN]
 M  +1 -1      kde/CMakeLists.txt  
 D             kde/kde_smoke.h  
 A             kde_smoke.h   kde/kde_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      khtml/CMakeLists.txt  
 M  +1 -1      khtml/generate.pl.cmake  
 D             khtml/khtml_smoke.h  
 A             khtml_smoke.h   khtml/khtml_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      ktexteditor/CMakeLists.txt  
 D             ktexteditor/ktexteditor_smoke.h  
 A             ktexteditor_smoke.h   ktexteditor/ktexteditor_smoke.h#816727 [License: UNKNOWN]
 M  +1 -1      nepomuk/CMakeLists.txt  
 D             nepomuk/nepomuk_smoke.h  
 A             nepomuk_smoke.h   nepomuk/nepomuk_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      okular/CMakeLists.txt  
 D             okular/okular_smoke.h  
 A             okular_smoke.h   okular/okular_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      phonon/CMakeLists.txt  
 D             phonon/phonon_smoke.h  
 A             phonon_smoke.h   phonon/phonon_smoke.h#816727 [License: UNKNOWN]
 M  +1 -1      plasma/CMakeLists.txt  
 D             plasma/plasma_smoke.h  
 A             plasma_smoke.h   plasma/plasma_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      qsci/CMakeLists.txt  
 D             qsci/qsci_smoke.h  
 A             qsci_smoke.h   qsci/qsci_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      qt/CMakeLists.txt  
 D             qt/qt_smoke.h  
 A             qt_smoke.h   qt/qt_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      qtuitools/CMakeLists.txt  
 D             qtuitools/qtuitools_smoke.h  
 A             qtuitools_smoke.h   qtuitools/qtuitools_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      qtwebkit/CMakeLists.txt  
 D             qtwebkit/qtwebkit_smoke.h  
 A             qtwebkit_smoke.h   qtwebkit/qtwebkit_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      qwt/CMakeLists.txt  
 D             qwt/qwt_smoke.h  
 A             qwt_smoke.h   qwt/qwt_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      solid/CMakeLists.txt  
 D             solid/solid_smoke.h  
 A             solid_smoke.h   solid/solid_smoke.h#816727 [License: UNKNOWN]
 M  +2 -2      soprano/CMakeLists.txt  
 D             soprano/soprano_smoke.h  
 A             soprano_smoke.h   soprano/soprano_smoke.h#816727 [License: UNKNOWN]


--- trunk/KDE/kdebindings/smoke/akonadi/CMakeLists.txt #816754:816755
@@ -94,7 +94,7 @@
 
 set_target_properties(smokeakonadi PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokeakonadi DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES akonadi_smoke.h DESTINATION include/smoke/akonadi )
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/akonadi_smoke.h DESTINATION include/smoke )
 
 ########### install files ###############
 
--- trunk/KDE/kdebindings/smoke/kde/CMakeLists.txt #816754:816755
@@ -125,4 +125,4 @@
 
 set_target_properties(smokekde PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokekde DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/kde_smoke.h DESTINATION include/smoke)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/kde_smoke.h DESTINATION include/smoke)
--- trunk/KDE/kdebindings/smoke/khtml/CMakeLists.txt #816754:816755
@@ -1,5 +1,5 @@
 
-include_directories( ${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qt ${CMAKE_SOURCE_DIR}/smoke/kde )
+include_directories( ${CMAKE_SOURCE_DIR}/smoke )
 
 set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 set(KDE_PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -120,4 +120,4 @@
 
 set_target_properties(smokekhtml PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokekhtml DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES khtml_smoke.h DESTINATION include/smoke/khtml)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/khtml_smoke.h DESTINATION include/smoke)
--- trunk/KDE/kdebindings/smoke/khtml/generate.pl.cmake #816754:816755
@@ -23,7 +23,7 @@
 my $kdeheaderlistpath = "$here/$kdeheaderlist";
 
 my $khtmlheaderlist = "@CMAKE_CURRENT_SOURCE_DIR@/khtml_header_list";
-my $khtmlheaderlistpath = "$here/$kdeheaderlist";
+my $khtmlheaderlistpath = "$here/$khtmlheaderlist";
 
 ## If srcdir != builddir, use headerlist from src
 $headerlistpath = $headerlist if ($headerlist =~ /^\//);
--- trunk/KDE/kdebindings/smoke/ktexteditor/CMakeLists.txt #816754:816755
@@ -1,5 +1,5 @@
 
-include_directories( ${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qt ${CMAKE_SOURCE_DIR}/smoke/kde )
+include_directories( ${CMAKE_SOURCE_DIR}/smoke )
 
 set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 set(KDE_PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -120,4 +120,4 @@
 
 set_target_properties(smokektexteditor PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokektexteditor DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES ktexteditor_smoke.h DESTINATION include/smoke/ktexteditor)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/ktexteditor_smoke.h DESTINATION include/smoke )
--- trunk/KDE/kdebindings/smoke/nepomuk/CMakeLists.txt #816754:816755
@@ -50,7 +50,7 @@
 
 set_target_properties(smokenepomuk PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokenepomuk DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES nepomuk_smoke.h DESTINATION include/smoke/nepomuk )
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/nepomuk_smoke.h DESTINATION include/smoke )
 
 ########### install files ###############
 
--- trunk/KDE/kdebindings/smoke/okular/CMakeLists.txt #816754:816755
@@ -1,5 +1,5 @@
 
-include_directories( ${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qt ${CMAKE_SOURCE_DIR}/smoke/kde )
+include_directories( ${CMAKE_SOURCE_DIR}/smoke )
 
 set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 set(KDE_PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -121,4 +121,4 @@
 
 set_target_properties(smokeokular PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokeokular DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES okular_smoke.h DESTINATION include/smoke/okular)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/okular_smoke.h DESTINATION include/smoke)
--- trunk/KDE/kdebindings/smoke/phonon/CMakeLists.txt #816754:816755
@@ -1,5 +1,5 @@
 
-include_directories( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../qt )
+include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke  )
 
 IF(NOT PERL_FOUND)
     FIND_PACKAGE(PERL REQUIRED)
@@ -71,7 +71,7 @@
 set_target_properties(smokephonon PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
 install(TARGETS smokephonon DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
-install(FILES phonon_smoke.h DESTINATION include/smoke/phonon)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/phonon_smoke.h DESTINATION include/smoke)
 
 FOREACH(incname ${QT_INCLUDES})
     SET(qt_incs "'${incname}', ${qt_incs}")
--- trunk/KDE/kdebindings/smoke/plasma/CMakeLists.txt #816754:816755
@@ -88,7 +88,7 @@
 
 set_target_properties(smokeplasma PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokeplasma DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES plasma_smoke.h DESTINATION include/smoke/plasma )
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/plasma_smoke.h DESTINATION include/smoke )
 
 ########### install files ###############
 
--- trunk/KDE/kdebindings/smoke/qsci/CMakeLists.txt #816754:816755
@@ -1,6 +1,6 @@
 FIND_PACKAGE(QScintilla REQUIRED)
 
-include_directories( ${QT_INCLUDES} ${QSCINTILLA_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../qt )
+include_directories( ${QT_INCLUDES} ${QSCINTILLA_INCLUDE_DIR} )
 
 IF(NOT PERL_FOUND)
     FIND_PACKAGE(PERL REQUIRED)
@@ -71,7 +71,7 @@
 set_target_properties(smokeqsci PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
 install(TARGETS smokeqsci DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
-install(FILES qsci_smoke.h DESTINATION include/smoke/qsci)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/qsci_smoke.h DESTINATION include/smoke)
 
 FOREACH(incname ${QT_INCLUDES} ${QSCINTILLA_INCLUDE_DIR})
     SET(qt_incs "'${incname}', ${qt_incs}")
--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #816754:816755
@@ -1,5 +1,5 @@
 
-include_directories( ${QT_INCLUDES}  ${CMAKE_CURRENT_SOURCE_DIR}/../ )
+include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke )
 
 
 IF(NOT PERL_FOUND)
@@ -122,7 +122,7 @@
 # Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
 # for Qt only installs
 install(TARGETS smokeqt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
-install(FILES qt_smoke.h DESTINATION include/smoke/qt)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/qt_smoke.h DESTINATION include/smoke)
 
 configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY)
 configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )
--- trunk/KDE/kdebindings/smoke/qtuitools/CMakeLists.txt #816754:816755
@@ -1,5 +1,5 @@
 
-include_directories( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../qt )
+include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke  )
 
 IF(NOT PERL_FOUND)
     FIND_PACKAGE(PERL REQUIRED)
@@ -32,7 +32,7 @@
 set_target_properties(smokeqtuitools PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
 install(TARGETS smokeqtuitools DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
-install(FILES qtuitools_smoke.h DESTINATION include/smoke/qtuitools)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtuitools_smoke.h DESTINATION include/smoke)
 
 FOREACH(incname ${QT_INCLUDES})
     SET(qt_incs "'${incname}', ${qt_incs}")
--- trunk/KDE/kdebindings/smoke/qtwebkit/CMakeLists.txt #816754:816755
@@ -1,5 +1,5 @@
 
-include_directories( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../qt )
+include_directories( ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke  )
 
 IF(NOT PERL_FOUND)
     FIND_PACKAGE(PERL REQUIRED)
@@ -32,7 +32,7 @@
 set_target_properties(smokeqtwebkit PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
 install(TARGETS smokeqtwebkit DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
-install(FILES qtwebkit_smoke.h DESTINATION include/smoke/qtwebkit)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/qtwebkit_smoke.h DESTINATION include/smoke )
 
 FOREACH(incname ${QT_INCLUDES})
     SET(qt_incs "'${incname}', ${qt_incs}")
--- trunk/KDE/kdebindings/smoke/qwt/CMakeLists.txt #816754:816755
@@ -1,6 +1,6 @@
 include(FindQwt5)
 
-include_directories( ${QT_INCLUDES} ${Qwt5_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../qt )
+include_directories( ${QT_INCLUDES} ${Qwt5_INCLUDE_DIR} )
 
 IF(NOT PERL_FOUND)
     FIND_PACKAGE(PERL REQUIRED)
@@ -71,7 +71,7 @@
 set_target_properties(smokeqwt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
 install(TARGETS smokeqwt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
-install(FILES qwt_smoke.h DESTINATION include/smoke/qwt)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/qwt_smoke.h DESTINATION include/smoke)
 
 FOREACH(incname ${QT_INCLUDES} ${Qwt5_INCLUDE_DIR})
     SET(qt_incs "'${incname}', ${qt_incs}")
--- trunk/KDE/kdebindings/smoke/solid/CMakeLists.txt #816754:816755
@@ -1,5 +1,5 @@
 
-include_directories( ${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/qt ${CMAKE_SOURCE_DIR}/smoke/kde )
+include_directories( ${CMAKE_SOURCE_DIR}/smoke )
 
 set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 set(KDE_PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -114,4 +114,4 @@
 
 set_target_properties(smokesolid PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS smokesolid DESTINATION ${LIB_INSTALL_DIR} )
-install(FILES solid_smoke.h DESTINATION include/smoke/solid)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/solid_smoke.h DESTINATION include/smoke)
--- trunk/KDE/kdebindings/smoke/soprano/CMakeLists.txt #816754:816755
@@ -3,7 +3,7 @@
 macro_log_feature(Soprano_FOUND "Soprano" "Soprano Libraries" "kdesupport" FALSE "" "Required to build Nepomuk.")
 set(soprano_includes ${SOPRANO_INCLUDE_DIR})
 
-include_directories( ${QT_INCLUDES} ${SOPRANO_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../qt )
+include_directories( ${QT_INCLUDES} ${SOPRANO_INCLUDE_DIR} )
 IF(NOT PERL_FOUND)
     FIND_PACKAGE(PERL REQUIRED)
 ENDIF(NOT PERL_FOUND)
@@ -73,7 +73,7 @@
 set_target_properties(smokesoprano PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
 install(TARGETS smokesoprano DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
-install(FILES soprano_smoke.h DESTINATION include/smoke/soprano)
+install(FILES ${CMAKE_SOURCE_DIR}/smoke/soprano_smoke.h DESTINATION include/smoke)
 
 FOREACH(incname ${QT_INCLUDES} ${SOPRANO_INCLUDE_DIR})
     SET(qt_incs "'${incname}', ${qt_incs}")



More information about the Kde-bindings mailing list