diff options
| author | Laurent Montel <montel@kde.org> | 2006-10-13 08:54:12 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2006-10-13 08:54:12 +0000 |
| commit | 5fe3c01736bedee17e1cb7a5e68f57c1010af8d3 (patch) | |
| tree | be39838c0d40ee41a56f216ec963785b99bcdf45 | |
| parent | 1d9d844a2cfa191d9dbc51376ae16ca519141b07 (diff) | |
| download | extra-cmake-modules-5fe3c01736bedee17e1cb7a5e68f57c1010af8d3.tar.gz extra-cmake-modules-5fe3c01736bedee17e1cb7a5e68f57c1010af8d3.tar.bz2 | |
Create final file when we call automoc macro
Fix list of file for final files (not take first file into
file list as _c_file argument)
Is it necessary to have a _c_file_ argument into create_final macro ?
CCMAIL: neundorf@kde.org
svn path=/trunk/KDE/kdelibs/; revision=595067
| -rw-r--r-- | modules/KDE4Macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 463d891f..02c05888 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -175,7 +175,7 @@ macro (KDE4_AUTOMOC _target_NAME) MAIN_DEPENDENCY ${_header} ) if (KDE4_ENABLE_FINAL) - #kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _c_files ${_SRCS}) + kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _c_files ${ARGN}) macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_moc}) else (KDE4_ENABLE_FINAL) macro_add_file_dependencies(${_abs_FILE} ${_moc}) @@ -583,7 +583,7 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME) endif (_uninst) if (KDE4_ENABLE_FINAL) - kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_c_files} ${_SRCS}) + kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _c_files ${_SRCS}) add_executable(${_target_NAME} ${_add_executable_param} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_c_files}) else (KDE4_ENABLE_FINAL) add_executable(${_target_NAME} ${_add_executable_param} ${_SRCS} ) |