mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-25 02:45:38 +00:00
Port to new kde4_automoc macro
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/playground/graphics/okular/; revision=595060
This commit is contained in:
parent
08877db01b
commit
9f317e53ca
|
@ -58,7 +58,7 @@ kde4_add_ui_files(okularcore_SRCS
|
||||||
|
|
||||||
kde4_add_kcfg_files(okularcore_SRCS conf/settings.kcfgc )
|
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})
|
kde4_add_library(okularcore SHARED ${okularcore_SRCS})
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ set(okularpart_SRCS
|
||||||
ui/painter_agg2/agg_vcgen_stroke.cpp
|
ui/painter_agg2/agg_vcgen_stroke.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
kde4_automoc(${okularpart_SRCS})
|
kde4_automoc(okularpart ${okularpart_SRCS})
|
||||||
|
|
||||||
kde4_add_plugin(okularpart WITH_PREFIX ${okularpart_SRCS})
|
kde4_add_plugin(okularpart WITH_PREFIX ${okularpart_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ set(okularGenerator_chmlib_SRCS
|
||||||
|
|
||||||
set(okularGenerator_chmlib_PART_SRCS ${chmlib_SRCS} ${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})
|
kde4_add_plugin(okularGenerator_chmlib WITH_PREFIX ${okularGenerator_chmlib_PART_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ include_directories(
|
||||||
|
|
||||||
set(kio_msits_PART_SRCS msits.cpp )
|
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})
|
kde4_add_plugin(kio_msits ${kio_msits_PART_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ set(okularGenerator_djvu_SRCS
|
||||||
kdjvu.cpp
|
kdjvu.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
kde4_automoc(${okularGenerator_djvu_SRCS})
|
kde4_automoc(okularGenerator_djvu ${okularGenerator_djvu_SRCS})
|
||||||
|
|
||||||
kde4_add_plugin(okularGenerator_djvu WITH_PREFIX ${okularGenerator_djvu_SRCS})
|
kde4_add_plugin(okularGenerator_djvu WITH_PREFIX ${okularGenerator_djvu_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ set(okularGenerator_dvi_SRCS
|
||||||
dvisourcesplitter.cpp
|
dvisourcesplitter.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
kde4_automoc(${okularGenerator_dvi_SRCS})
|
kde4_automoc(okularGenerator_dvi ${okularGenerator_dvi_SRCS})
|
||||||
|
|
||||||
kde4_add_plugin(okularGenerator_dvi WITH_PREFIX ${okularGenerator_dvi_SRCS})
|
kde4_add_plugin(okularGenerator_dvi WITH_PREFIX ${okularGenerator_dvi_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ include_directories(
|
||||||
|
|
||||||
set(okularGenerator_fax_PART_SRCS faxrenderer.cpp )
|
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})
|
kde4_add_plugin(okularGenerator_fax WITH_PREFIX ${okularGenerator_fax_PART_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
set(kfaximage_LIB_SRCS kfaximage.cpp faxexpand.cpp faxinit.cpp )
|
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})
|
kde4_add_library(kfaximage SHARED ${kfaximage_LIB_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ set(okulargsasyncgenerator_SRCS
|
||||||
okulargsasyncgenerator.cpp
|
okulargsasyncgenerator.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
kde4_automoc(${okulargsasyncgenerator_SRCS})
|
kde4_automoc(okulargsasyncgenerator ${okulargsasyncgenerator_SRCS})
|
||||||
|
|
||||||
kde4_add_executable(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_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})
|
kde4_add_plugin(okularGenerator_ghostview WITH_PREFIX ${okularGenerator_ghostview_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ include_directories(
|
||||||
|
|
||||||
set(okularGenerator_kimgio_PART_SRCS generator_kimgio.cpp )
|
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})
|
kde4_add_plugin(okularGenerator_kimgio WITH_PREFIX ${okularGenerator_kimgio_PART_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ set(okularGenerator_ooo_PART_SRCS
|
||||||
styleparser.cpp
|
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})
|
kde4_add_plugin(okularGenerator_ooo WITH_PREFIX ${okularGenerator_ooo_PART_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ include_directories(
|
||||||
|
|
||||||
set(okularGenerator_poppler_PART_SRCS generator_pdf.cpp )
|
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})
|
kde4_add_plugin(okularGenerator_poppler WITH_PREFIX ${okularGenerator_poppler_PART_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ set(okularGenerator_tiff_SRCS
|
||||||
generator_tiff.cpp
|
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})
|
kde4_add_plugin(okularGenerator_tiff WITH_PREFIX ${okularGenerator_tiff_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ set(okularGenerator_xps_SRCS
|
||||||
generator_xps.cpp
|
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})
|
kde4_add_plugin(okularGenerator_xps WITH_PREFIX ${okularGenerator_xps_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
set(okular_SRCS main.cpp shell.cpp )
|
set(okular_SRCS main.cpp shell.cpp )
|
||||||
|
|
||||||
kde4_automoc(${okular_SRCS})
|
kde4_automoc(okular ${okular_SRCS})
|
||||||
|
|
||||||
kde4_add_executable(okular ${okular_SRCS})
|
kde4_add_executable(okular ${okular_SRCS})
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue