From 9f317e53ca53318763fac96c0dc8856672328124 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 13 Oct 2006 08:13:52 +0000 Subject: [PATCH] Port to new kde4_automoc macro Necessary to change KDE4_AUTOMOC macro to support enable-final argument (there was not a dependancy between _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 /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/playground/graphics/okular/; revision=595060 --- CMakeLists.txt | 4 ++-- generators/chm/CMakeLists.txt | 2 +- generators/chm/kio-msits/CMakeLists.txt | 2 +- generators/djvu/CMakeLists.txt | 2 +- generators/dvi/CMakeLists.txt | 2 +- generators/fax/CMakeLists.txt | 2 +- generators/fax/libkfaximage/CMakeLists.txt | 2 +- generators/ghostview/CMakeLists.txt | 4 ++-- generators/kimgio/CMakeLists.txt | 2 +- generators/ooo/CMakeLists.txt | 2 +- generators/poppler/CMakeLists.txt | 2 +- generators/tiff/CMakeLists.txt | 2 +- generators/xps/CMakeLists.txt | 2 +- shell/CMakeLists.txt | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9620fdcc3..2ccf12842 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ kde4_add_ui_files(okularcore_SRCS kde4_add_kcfg_files(okularcore_SRCS conf/settings.kcfgc ) -kde4_automoc(${okularcore_SRCS}) +kde4_automoc(okularcore ${okularcore_SRCS}) kde4_add_library(okularcore SHARED ${okularcore_SRCS}) @@ -93,7 +93,7 @@ set(okularpart_SRCS ui/painter_agg2/agg_vcgen_stroke.cpp ) -kde4_automoc(${okularpart_SRCS}) +kde4_automoc(okularpart ${okularpart_SRCS}) kde4_add_plugin(okularpart WITH_PREFIX ${okularpart_SRCS}) diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt index 7043ea630..122a7b52a 100644 --- a/generators/chm/CMakeLists.txt +++ b/generators/chm/CMakeLists.txt @@ -24,7 +24,7 @@ set(okularGenerator_chmlib_SRCS set(okularGenerator_chmlib_PART_SRCS ${chmlib_SRCS} ${okularGenerator_chmlib_SRCS} ) -kde4_automoc(${okularGenerator_chmlib_PART_SRCS}) +kde4_automoc(okularGenerator_chmlib ${okularGenerator_chmlib_PART_SRCS}) kde4_add_plugin(okularGenerator_chmlib WITH_PREFIX ${okularGenerator_chmlib_PART_SRCS}) diff --git a/generators/chm/kio-msits/CMakeLists.txt b/generators/chm/kio-msits/CMakeLists.txt index 372533244..31801bc86 100644 --- a/generators/chm/kio-msits/CMakeLists.txt +++ b/generators/chm/kio-msits/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories( set(kio_msits_PART_SRCS msits.cpp ) -kde4_automoc(${kio_msits_PART_SRCS}) +kde4_automoc(kio_msits ${kio_msits_PART_SRCS}) kde4_add_plugin(kio_msits ${kio_msits_PART_SRCS}) diff --git a/generators/djvu/CMakeLists.txt b/generators/djvu/CMakeLists.txt index cad110a8b..066897651 100644 --- a/generators/djvu/CMakeLists.txt +++ b/generators/djvu/CMakeLists.txt @@ -12,7 +12,7 @@ set(okularGenerator_djvu_SRCS kdjvu.cpp ) -kde4_automoc(${okularGenerator_djvu_SRCS}) +kde4_automoc(okularGenerator_djvu ${okularGenerator_djvu_SRCS}) kde4_add_plugin(okularGenerator_djvu WITH_PREFIX ${okularGenerator_djvu_SRCS}) diff --git a/generators/dvi/CMakeLists.txt b/generators/dvi/CMakeLists.txt index a18739ba8..3dd1e99fe 100644 --- a/generators/dvi/CMakeLists.txt +++ b/generators/dvi/CMakeLists.txt @@ -39,7 +39,7 @@ set(okularGenerator_dvi_SRCS dvisourcesplitter.cpp ) -kde4_automoc(${okularGenerator_dvi_SRCS}) +kde4_automoc(okularGenerator_dvi ${okularGenerator_dvi_SRCS}) kde4_add_plugin(okularGenerator_dvi WITH_PREFIX ${okularGenerator_dvi_SRCS}) diff --git a/generators/fax/CMakeLists.txt b/generators/fax/CMakeLists.txt index 7f529e6b9..587d94cd9 100644 --- a/generators/fax/CMakeLists.txt +++ b/generators/fax/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( set(okularGenerator_fax_PART_SRCS faxrenderer.cpp ) -kde4_automoc(${okularGenerator_fax_PART_SRCS}) +kde4_automoc(okularGenerator_fax ${okularGenerator_fax_PART_SRCS}) kde4_add_plugin(okularGenerator_fax WITH_PREFIX ${okularGenerator_fax_PART_SRCS}) diff --git a/generators/fax/libkfaximage/CMakeLists.txt b/generators/fax/libkfaximage/CMakeLists.txt index 29f64a941..2a0067aac 100644 --- a/generators/fax/libkfaximage/CMakeLists.txt +++ b/generators/fax/libkfaximage/CMakeLists.txt @@ -3,7 +3,7 @@ set(kfaximage_LIB_SRCS kfaximage.cpp faxexpand.cpp faxinit.cpp ) -kde4_automoc(${kfaximage_LIB_SRCS}) +kde4_automoc(kfaximage ${kfaximage_LIB_SRCS}) kde4_add_library(kfaximage SHARED ${kfaximage_LIB_SRCS}) diff --git a/generators/ghostview/CMakeLists.txt b/generators/ghostview/CMakeLists.txt index 65c66ca2d..d6ceab284 100644 --- a/generators/ghostview/CMakeLists.txt +++ b/generators/ghostview/CMakeLists.txt @@ -14,7 +14,7 @@ set(okulargsasyncgenerator_SRCS okulargsasyncgenerator.cpp ) -kde4_automoc(${okulargsasyncgenerator_SRCS}) +kde4_automoc(okulargsasyncgenerator ${okulargsasyncgenerator_SRCS}) kde4_add_executable(okulargsasyncgenerator ${okulargsasyncgenerator_SRCS}) @@ -41,7 +41,7 @@ kde4_add_ui_files(okularGenerator_ghostview_SRCS kde4_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc ) -kde4_automoc(${okularGenerator_ghostview_SRCS}) +kde4_automoc(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS}) kde4_add_plugin(okularGenerator_ghostview WITH_PREFIX ${okularGenerator_ghostview_SRCS}) diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt index 2aebeb6c3..076f747a5 100644 --- a/generators/kimgio/CMakeLists.txt +++ b/generators/kimgio/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( set(okularGenerator_kimgio_PART_SRCS generator_kimgio.cpp ) -kde4_automoc(${okularGenerator_kimgio_PART_SRCS}) +kde4_automoc(okularGenerator_kimgio ${okularGenerator_kimgio_PART_SRCS}) kde4_add_plugin(okularGenerator_kimgio WITH_PREFIX ${okularGenerator_kimgio_PART_SRCS}) diff --git a/generators/ooo/CMakeLists.txt b/generators/ooo/CMakeLists.txt index da02d376e..9e36f39bb 100644 --- a/generators/ooo/CMakeLists.txt +++ b/generators/ooo/CMakeLists.txt @@ -15,7 +15,7 @@ set(okularGenerator_ooo_PART_SRCS styleparser.cpp ) -kde4_automoc(${okularGenerator_ooo_PART_SRCS}) +kde4_automoc(okularGenerator_ooo ${okularGenerator_ooo_PART_SRCS}) kde4_add_plugin(okularGenerator_ooo WITH_PREFIX ${okularGenerator_ooo_PART_SRCS}) diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt index 559b59e0c..1e62424e9 100644 --- a/generators/poppler/CMakeLists.txt +++ b/generators/poppler/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories( set(okularGenerator_poppler_PART_SRCS generator_pdf.cpp ) -kde4_automoc(${okularGenerator_poppler_PART_SRCS}) +kde4_automoc(okularGenerator_poppler ${okularGenerator_poppler_PART_SRCS}) kde4_add_plugin(okularGenerator_poppler WITH_PREFIX ${okularGenerator_poppler_PART_SRCS}) diff --git a/generators/tiff/CMakeLists.txt b/generators/tiff/CMakeLists.txt index a69279a08..801bf7318 100644 --- a/generators/tiff/CMakeLists.txt +++ b/generators/tiff/CMakeLists.txt @@ -10,7 +10,7 @@ set(okularGenerator_tiff_SRCS generator_tiff.cpp ) -kde4_automoc(${okularGenerator_tiff_SRCS}) +kde4_automoc(okularGenerator_tiff ${okularGenerator_tiff_SRCS}) kde4_add_plugin(okularGenerator_tiff WITH_PREFIX ${okularGenerator_tiff_SRCS}) diff --git a/generators/xps/CMakeLists.txt b/generators/xps/CMakeLists.txt index d04bb1688..f163d27de 100644 --- a/generators/xps/CMakeLists.txt +++ b/generators/xps/CMakeLists.txt @@ -9,7 +9,7 @@ set(okularGenerator_xps_SRCS generator_xps.cpp ) -kde4_automoc(${okularGenerator_xps_SRCS}) +kde4_automoc(okularGenerator_xps ${okularGenerator_xps_SRCS}) kde4_add_plugin(okularGenerator_xps WITH_PREFIX ${okularGenerator_xps_SRCS}) diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt index 5b91bb5c0..89e1bd73d 100644 --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -3,7 +3,7 @@ set(okular_SRCS main.cpp shell.cpp ) -kde4_automoc(${okular_SRCS}) +kde4_automoc(okular ${okular_SRCS}) kde4_add_executable(okular ${okular_SRCS})