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

List:       kde-commits
Subject:    koffice/tools
From:       Thomas Zander <zander () kde ! org>
Date:       2007-03-13 11:10:55
Message-ID: 1173784255.600494.8205.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 642108 by zander:

This is what I really wanted to do this morning, but failed.
Move the include to be only on the cmake files that actually need it and
at the same time make those more modular by having all the includes they
need themselves, instead of relying on a parent dir to include it.


 M  +0 -2      CMakeLists.txt  
 M  +1 -0      converter/CMakeLists.txt  
 M  +4 -3      kfile-plugins/abiword/CMakeLists.txt  
 M  +4 -3      kfile-plugins/gnumeric/CMakeLists.txt  
 M  +4 -3      kfile-plugins/koffice/CMakeLists.txt  
 M  +4 -3      kfile-plugins/ooo/CMakeLists.txt  
 M  +7 -6      thumbnail/CMakeLists.txt  


--- trunk/koffice/tools/CMakeLists.txt #642107:642108
@@ -1,5 +1,3 @@
-include_directories( ${KOFFICECORE_INCLUDES})
-
 add_subdirectory( converter )
 add_subdirectory( thumbnail )
 add_subdirectory( thesaurus )
--- trunk/koffice/tools/converter/CMakeLists.txt #642107:642108
@@ -1,3 +1,4 @@
+include_directories( ${KOFFICECORE_INCLUDES})
 
 set(koconverter_SRCS koconverter.cpp )
 
--- trunk/koffice/tools/kfile-plugins/abiword/CMakeLists.txt #642107:642108
@@ -1,9 +1,10 @@
+include_directories( ${KOFFICECORE_INCLUDES})
 
-set(kfile_abiword_PART_SRCS kfile_abiword.cpp )
+set(kfile_abiword_SRCS kfile_abiword.cpp )
 
-kde4_automoc(${kfile_abiword_PART_SRCS})
+kde4_automoc(${kfile_abiword_SRCS})
 
-kde4_add_plugin(kfile_abiword ${kfile_abiword_PART_SRCS})
+kde4_add_plugin(kfile_abiword ${kfile_abiword_SRCS})
 
 
 
--- trunk/koffice/tools/kfile-plugins/gnumeric/CMakeLists.txt #642107:642108
@@ -1,9 +1,10 @@
+include_directories( ${KOFFICECORE_INCLUDES})
 
-set(kfile_gnumeric_PART_SRCS kfile_gnumeric.cpp )
+set(kfile_gnumeric_SRCS kfile_gnumeric.cpp )
 
-kde4_automoc(${kfile_gnumeric_PART_SRCS})
+kde4_automoc(${kfile_gnumeric_SRCS})
 
-kde4_add_plugin(kfile_gnumeric ${kfile_gnumeric_PART_SRCS})
+kde4_add_plugin(kfile_gnumeric ${kfile_gnumeric_SRCS})
 
 
 
--- trunk/koffice/tools/kfile-plugins/koffice/CMakeLists.txt #642107:642108
@@ -1,9 +1,10 @@
+include_directories( ${KOFFICECORE_INCLUDES})
 
-set(kfile_koffice_PART_SRCS kfile_koffice.cpp )
+set(kfile_koffice_SRCS kfile_koffice.cpp )
 
-kde4_automoc(${kfile_koffice_PART_SRCS})
+kde4_automoc(${kfile_koffice_SRCS})
 
-kde4_add_plugin(kfile_koffice ${kfile_koffice_PART_SRCS})
+kde4_add_plugin(kfile_koffice ${kfile_koffice_SRCS})
 
 
 
--- trunk/koffice/tools/kfile-plugins/ooo/CMakeLists.txt #642107:642108
@@ -1,9 +1,10 @@
+include_directories( ${KOFFICECORE_INCLUDES})
 
-set(kfile_ooo_PART_SRCS kfile_ooo.cpp )
+set(kfile_ooo_SRCS kfile_ooo.cpp )
 
-kde4_automoc(${kfile_ooo_PART_SRCS})
+kde4_automoc(${kfile_ooo_SRCS})
 
-kde4_add_plugin(kfile_ooo ${kfile_ooo_PART_SRCS})
+kde4_add_plugin(kfile_ooo ${kfile_ooo_SRCS})
 
 
 
--- trunk/koffice/tools/thumbnail/CMakeLists.txt #642107:642108
@@ -1,11 +1,12 @@
+include_directories( ${KOFFICECORE_INCLUDES})
 
 ########### next target ###############
 
-set(clipartthumbnail_PART_SRCS clipartcreator.cpp )
+set(clipartthumbnail_SRCS clipartcreator.cpp )
 
-kde4_automoc(${clipartthumbnail_PART_SRCS})
+kde4_automoc(${clipartthumbnail_SRCS})
 
-kde4_add_plugin(clipartthumbnail ${clipartthumbnail_PART_SRCS})
+kde4_add_plugin(clipartthumbnail ${clipartthumbnail_SRCS})
 
 
 
@@ -16,11 +17,11 @@
 
 ########### next target ###############
 
-set(kofficethumbnail_PART_SRCS kofficecreator.cpp )
+set(kofficethumbnail_SRCS kofficecreator.cpp )
 
-kde4_automoc(${kofficethumbnail_PART_SRCS})
+kde4_automoc(${kofficethumbnail_SRCS})
 
-kde4_add_plugin(kofficethumbnail ${kofficethumbnail_PART_SRCS})
+kde4_add_plugin(kofficethumbnail ${kofficethumbnail_SRCS})
 
 
 
[prev in list] [next in list] [prev in thread] [next in thread]