diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-10-23 22:09:56 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-10-23 22:09:56 +0000 |
| commit | 1c388b04ce49019c0acab1fc203a6a615f5bd15c (patch) | |
| tree | 06a4e9541c57b205b41872ff2c2677ca058d9758 | |
| parent | 6e320b8bb16b631e4a74a2c71657ff1f2e0a78f4 (diff) | |
| download | extra-cmake-modules-1c388b04ce49019c0acab1fc203a6a615f5bd15c.tar.gz extra-cmake-modules-1c388b04ce49019c0acab1fc203a6a615f5bd15c.tar.bz2 | |
-remove some commented out code
-fix kde4_add_kdeinit_executable() for enable_final
Laurent: this can't have worked before, did it ?
CCMAIL: montel@kde.org
Alex
svn path=/trunk/KDE/kdelibs/; revision=598548
| -rw-r--r-- | modules/KDE4Macros.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 68e462e2..1d1af39a 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -202,7 +202,6 @@ macro (KDE4_AUTOMOC) endif (_match) set_source_files_properties(${_abs_FILE} PROPERTIES AUTOMOC_FILES "${_moc_FILES_PROPERTY}") - #message(STATUS "mocs for ${_abs_FILE}: ${_moc_FILES_PROPERTY}") endif (EXISTS ${_abs_FILE} AND NOT _skip) endforeach (_current_FILE) endmacro (KDE4_AUTOMOC) @@ -211,13 +210,11 @@ endmacro (KDE4_AUTOMOC) macro(KDE4_GET_AUTOMOC_FILES _list) set(${_list}) foreach (_current_FILE ${ARGN}) - #message(STATUS "Checking ${_current_FILE}") set(_automoc_FILES_PROPERTY) get_source_file_property(_automoc_FILES_PROPERTY ${_current_FILE} AUTOMOC_FILES) if (_automoc_FILES_PROPERTY) foreach (_current_MOC_FILE ${_automoc_FILES_PROPERTY}) list(APPEND ${_list} ${_current_MOC_FILE}) - #message(STATUS "MOC ${_current_MOC_FILE}") endforeach (_current_MOC_FILE) endif (_automoc_FILES_PROPERTY) endforeach (_current_FILE) @@ -591,8 +588,9 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) kde4_get_automoc_files(_automoc_FILES ${ARGN}) if (KDE4_ENABLE_FINAL) - kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _separate_file ${_SRCS}) - add_library(kdeinit_${_target_NAME} SHARED ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_separate_files} ${_automoc_FILES} ${_SRCS}) + kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS}) + add_library(kdeinit_${_target_NAME} SHARED ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_final_cpp.cpp ${_separate_files} ${_automoc_FILES}) + else (KDE4_ENABLE_FINAL) add_library(kdeinit_${_target_NAME} SHARED ${_SRCS} ${_automoc_FILES}) endif (KDE4_ENABLE_FINAL) |