Necessary to change KDE4_AUTOMOC macro to support

enable-final argument

(there was not a dependancy between <name>_final.cpp file and
moc generated files => moc files were never created)

Not necessary to rebuild all kdelibs just cp kdelibs/cmake/modules/KDE4Macros.cmake <path_kde4>/share/apps/cmake/modules

I ported and tested all kde module (without enable-final argument, it compiles fines (test and program))
Don't try to use enable-final argument for the moment it doesn't compile (but dependancy works)

Regards

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=595045

diff --git a/extdate/CMakeLists.txt b/extdate/CMakeLists.txt
index 17fcc03e93db9b9d57acce8da3520ac73b5cd569..9d7380f7d93d9300f2be40538a48c7192b32ba4c 100644 (file)
--- a/extdate/CMakeLists.txt
+++ b/extdate/CMakeLists.txt
@@ -15,7 +15,7 @@ set(extdate_LIB_SRCS
    extdatetimeedit.cpp 
    extdatewidget.cpp )
 
-kde4_automoc(${extdate_LIB_SRCS})
+kde4_automoc(extdate ${extdate_LIB_SRCS})
 
 kde4_add_library(extdate SHARED ${extdate_LIB_SRCS})
 

diff --git a/extdate/tests/CMakeLists.txt b/extdate/tests/CMakeLists.txt
index 1aba207d7ec9364b596d02776948b2bbdcc94f3c..77dc3cd2185442d659c81ed7af94372b90aad5e8 100644 (file)
--- a/extdate/tests/CMakeLists.txt
+++ b/extdate/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/extdate  )
 
 set(test_extdate_SRCS test_extdate.cc )
 
-kde4_automoc(${test_extdate_SRCS})
+kde4_automoc(test_extdate ${test_extdate_SRCS})
 
 kde4_add_executable(test_extdate ${test_extdate_SRCS})
 
@@ -16,7 +16,7 @@ target_link_libraries(test_extdate  ${KDE4_KDECORE_LIBS} extdate )
 
 set(test_extdatepicker_SRCS edpicker_widget.cpp edpicker_main.cpp )
 
-kde4_automoc(${test_extdatepicker_SRCS})
+kde4_automoc(test_extdatepicker ${test_extdatepicker_SRCS})
 
 kde4_add_executable(test_extdatepicker ${test_extdatepicker_SRCS})
 
@@ -26,7 +26,7 @@ target_link_libraries(test_extdatepicker  ${KDE4_KDECORE_LIBS} extdate )
 
 set(test_extdatetimeedit_SRCS edtedit_widget.cpp edtedit_main.cpp )
 
-kde4_automoc(${test_extdatetimeedit_SRCS})
+kde4_automoc(test_extdatetimeedit ${test_extdatetimeedit_SRCS})
 
 kde4_add_executable(test_extdatetimeedit ${test_extdatetimeedit_SRCS})
 

diff --git a/kdeeducore/CMakeLists.txt b/kdeeducore/CMakeLists.txt
index cb535b6e58fd4158054736c51be6f9f4113c3c95..710280dce858a012670e75079d858b7367a83563 100644 (file)
--- a/kdeeducore/CMakeLists.txt
+++ b/kdeeducore/CMakeLists.txt
@@ -16,7 +16,7 @@ set(kdeeducore_LIB_SRCS
    leitnersystemview.cpp
    prefleitner.cpp )
 
-kde4_automoc(${kdeeducore_LIB_SRCS})
+kde4_automoc(kdeeducore ${kdeeducore_LIB_SRCS})
 
 kde4_add_ui_files(kdeeducore_LIB_SRCS
    prefleitnerbase.ui

diff --git a/kdeeducore/tests/CMakeLists.txt b/kdeeducore/tests/CMakeLists.txt
index 9d7774eef6bc2d82f0b679e3d42c775cacbf1bad..303769726a969b9750fed116f224cc2522f7b34f 100644 (file)
--- a/kdeeducore/tests/CMakeLists.txt
+++ b/kdeeducore/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/kdeeducore  )
 if(KDE4_BUILD_TESTS)
 set(loader_SRCS loader.cpp )
 
-kde4_automoc(${loader_SRCS})
+kde4_automoc(loader ${loader_SRCS})
 
 kde4_add_executable(loader ${loader_SRCS})
 

diff --git a/kdeeduplot/CMakeLists.txt b/kdeeduplot/CMakeLists.txt
index 77d6ac2a175823f641d22ef4022942bda7d2c91f..20be724d53b310841133de649d2c5a3090fcddf4 100644 (file)
--- a/kdeeduplot/CMakeLists.txt
+++ b/kdeeduplot/CMakeLists.txt
@@ -8,7 +8,7 @@ set(kdeeduplot_LIB_SRCS
    kplotwidget.cpp
 )
 
-kde4_automoc(${kdeeduplot_LIB_SRCS})
+kde4_automoc(kdeeduplot ${kdeeduplot_LIB_SRCS})
 
 kde4_add_library(kdeeduplot SHARED ${kdeeduplot_LIB_SRCS})
 

diff --git a/kdeeduui/CMakeLists.txt b/kdeeduui/CMakeLists.txt
index c0c20288a91d00f8ca37729dc4003a6c1c85a2d2..2cbd646b67e33a5c412daca50cc9cb6c8e18df54 100644 (file)
--- a/kdeeduui/CMakeLists.txt
+++ b/kdeeduui/CMakeLists.txt
@@ -8,7 +8,7 @@ set(kdeeduui_LIB_SRCS
    kdeeduglossary.cpp
 )
 
-kde4_automoc(${kdeeduui_LIB_SRCS})
+kde4_automoc(kdeeduui ${kdeeduui_LIB_SRCS})
 
 kde4_add_library(kdeeduui SHARED ${kdeeduui_LIB_SRCS})
 

diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index 576a50c59cb56df658c2c4c7647d6d2df2bbb050..0d7e4290817c611b7591c950523c3b593ab6fd6b 100644 (file)
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -19,7 +19,7 @@ set(science_LIB_SRCS
    parser.cpp
 )
 
-kde4_automoc(${science_LIB_SRCS})
+kde4_automoc(science ${science_LIB_SRCS})
 
 kde4_add_library(science SHARED ${science_LIB_SRCS})