Commit 83346f38 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

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/kdemultimedia/libkcddb/; revision=595046
parent f9427388
......@@ -49,7 +49,7 @@ set(kcddb_LIB_SRCS ${libmusicbrainz_SRCS}
cdinfodialog.cpp
cdinfoencodingwidget.cpp )
kde4_automoc(${kcddb_LIB_SRCS})
kde4_automoc(kcddb ${kcddb_LIB_SRCS})
kde4_add_ui_files(kcddb_LIB_SRCS cdinfodialog.ui cdinfoencodingwidget.ui )
......
......@@ -7,7 +7,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/
set(kcm_cddb_PART_SRCS cddbconfigwidget.cpp kcmcddb.cpp )
SET_SOURCE_FILES_PROPERTIES(cddbconfigwidget.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_cddbconfigwidget.h)
kde4_automoc(${kcm_cddb_PART_SRCS})
kde4_automoc(kcm_cddb ${kcm_cddb_PART_SRCS})
kde4_add_ui_files(kcm_cddb_PART_SRCS cddbconfigwidget.ui )
......
......@@ -5,81 +5,81 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/
if(KDE4_BUILD_TESTS)
set(syncsmtpsubmittest_SRCS syncsmtpsubmittest.cpp )
kde4_automoc(${syncsmtpsubmittest_SRCS})
kde4_automoc(syncsmtpsubmittest ${syncsmtpsubmittest_SRCS})
kde4_add_executable(syncsmtpsubmittest RUN_UNINSTALLED ${syncsmtpsubmittest_SRCS})
target_link_libraries(syncsmtpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
set(asyncsmtpsubmittest_SRCS asyncsmtpsubmittest.cpp )
kde4_automoc(${asyncsmtpsubmittest_SRCS})
kde4_automoc(asyncsmtpsubmittest ${asyncsmtpsubmittest_SRCS})
kde4_add_executable(asyncsmtpsubmittest RUN_UNINSTALLED ${asyncsmtpsubmittest_SRCS})
target_link_libraries(asyncsmtpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
set(asynchttplookuptest_SRCS asynchttplookuptest.cpp )
kde4_automoc(${asynchttplookuptest_SRCS})
kde4_automoc(asynchttplookuptest ${asynchttplookuptest_SRCS})
kde4_add_executable(asynchttplookuptest RUN_UNINSTALLED ${asynchttplookuptest_SRCS})
target_link_libraries(asynchttplookuptest ${KDE4_KDECORE_LIBS} kcddb ${QT_QTTEST_LIBRARY} )
add_test(asynchttplookuptest ${EXECUTABLE_OUTPUT_PATH}/asynccddblookuptest)
set(asynccddblookuptest_SRCS asynccddblookuptest.cpp )
kde4_automoc(${asynccddblookuptest_SRCS})
kde4_automoc(asynccddblookuptest ${asynccddblookuptest_SRCS})
kde4_add_executable(asynccddblookuptest RUN_UNINSTALLED ${asynccddblookuptest_SRCS})
target_link_libraries(asynccddblookuptest ${KDE4_KDECORE_LIBS} kcddb ${QT_QTTEST_LIBRARY} )
add_test(asynccddblookuptest ${EXECUTABLE_OUTPUT_PATH}/asynccddblookuptest)
set(synccddblookuptest_SRCS synccddblookuptest.cpp )
kde4_automoc(${synccddblookuptest_SRCS})
kde4_automoc(synccddblookuptest ${synccddblookuptest_SRCS})
kde4_add_executable(synccddblookuptest RUN_UNINSTALLED ${synccddblookuptest_SRCS})
target_link_libraries(synccddblookuptest ${KDE4_KDECORE_LIBS} kcddb ${QT_QTTEST_LIBRARY} )
add_test(synccddblookuptest ${EXECUTABLE_OUTPUT_PATH}/synccddblookuptest)
set(synchttplookuptest_SRCS synchttplookuptest.cpp )
kde4_automoc(${synchttplookuptest_SRCS})
kde4_automoc(synchttplookuptest ${synchttplookuptest_SRCS})
kde4_add_executable(synchttplookuptest RUN_UNINSTALLED ${synchttplookuptest_SRCS})
target_link_libraries(synchttplookuptest ${KDE4_KDECORE_LIBS} kcddb ${QT_QTTEST_LIBRARY} )
add_test(synchttplookuptest ${EXECUTABLE_OUTPUT_PATH}/synchttplookuptest)
set(asynchttpsubmittest_SRCS asynchttpsubmittest.cpp )
kde4_automoc(${asynchttpsubmittest_SRCS})
kde4_automoc(asynchttpsubmittest ${asynchttpsubmittest_SRCS})
kde4_add_executable(asynchttpsubmittest RUN_UNINSTALLED ${asynchttpsubmittest_SRCS})
target_link_libraries(asynchttpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
set(synchttpsubmittest_SRCS synchttpsubmittest.cpp )
kde4_automoc(${synchttpsubmittest_SRCS})
kde4_automoc(synchttpsubmittest ${synchttpsubmittest_SRCS})
kde4_add_executable(synchttpsubmittest RUN_UNINSTALLED ${synchttpsubmittest_SRCS})
target_link_libraries(synchttpsubmittest ${KDE4_KDECORE_LIBS} kcddb )
set(sitestest_SRCS sitestest.cpp )
kde4_automoc(${sitestest_SRCS})
kde4_automoc(sitestest ${sitestest_SRCS})
kde4_add_executable(sitestest RUN_UNINSTALLED ${sitestest_SRCS})
target_link_libraries(sitestest ${KDE4_KDECORE_LIBS} kcddb )
set(utf8test_SRCS utf8test.cpp )
kde4_automoc(${utf8test_SRCS})
kde4_automoc(utf8test ${utf8test_SRCS})
kde4_add_executable(utf8test RUN_UNINSTALLED ${utf8test_SRCS})
target_link_libraries(utf8test ${KDE4_KDECORE_LIBS} kcddb ${QT_QTTEST_LIBRARY} )
add_test(utf8test ${EXECUTABLE_OUTPUT_PATH}/utf8test)
set(musicbrainztest_SRCS musicbrainztest.cpp )
kde4_automoc(${musicbrainztest_SRCS})
kde4_automoc(musicbrainztest ${musicbrainztest_SRCS})
kde4_add_executable(musicbrainztest RUN_UNINSTALLED ${musicbrainztest_SRCS})
target_link_libraries(musicbrainztest ${KDE4_KDECORE_LIBS} kcddb ${QT_QTTEST_LIBRARY} )
add_test(musicbrainztest ${EXECUTABLE_OUTPUT_PATH}/musicbrainztest)
set(asyncmusicbrainztest_SRCS asyncmusicbrainztest.cpp )
kde4_automoc(${asyncmusicbrainztest_SRCS})
kde4_automoc(asyncmusicbrainztest ${asyncmusicbrainztest_SRCS})
kde4_add_executable(asyncmusicbrainztest RUN_UNINSTALLED ${asyncmusicbrainztest_SRCS})
target_link_libraries(asyncmusicbrainztest ${KDE4_KDECORE_LIBS} kcddb ${QT_QTTEST_LIBRARY} )
add_test(asyncmusicbrainztest ${EXECUTABLE_OUTPUT_PATH}/asyncmusicbrainztest)
set(cdinfotest_SRCS cdinfotest.cpp )
kde4_automoc(${cdinfotest_SRCS})
kde4_automoc(cdinfotest ${cdinfotest_SRCS})
kde4_add_executable(cdinfotest RUN_UNINSTALLED ${cdinfotest_SRCS})
target_link_libraries(cdinfotest ${KDE4_KDECORE_LIBS} kcddb ${QT_QTTEST_LIBRARY} )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment