diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-10-24 22:16:20 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-10-24 22:16:20 +0000 |
| commit | 709c8181ca64c6521031fa901fa12763bdcf1d97 (patch) | |
| tree | a06d14148252ee822dcb75ca68411a17cf4ee391 | |
| parent | 770aa5f72a07dda2c15e598e71e63aa571f63b92 (diff) | |
| download | extra-cmake-modules-709c8181ca64c6521031fa901fa12763bdcf1d97.tar.gz extra-cmake-modules-709c8181ca64c6521031fa901fa12763bdcf1d97.tar.bz2 | |
-make enable_final work for kdeinit executables: give the final-file for the kdeinit lib a different name than the final-file for the application
Alex
CCMAIL: montel@kde.org
svn path=/trunk/KDE/kdelibs/; revision=598883
| -rw-r--r-- | modules/KDE4Macros.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index d00dc016..1aae018c 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -577,19 +577,17 @@ endmacro(KDE4_CHECK_EXECUTABLE_PARAMS) macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) kde4_check_executable_params(_SRCS _nogui _uninst ${ARGN}) - configure_file(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) - #MACRO_ADDITIONAL_CLEAN_FILES(${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) # if (WIN32) # # under windows, just build a normal executable # KDE4_ADD_EXECUTABLE(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${ARGN} ) # else (WIN32) # under UNIX, create a shared library and a small executable, which links to this library - kde4_get_automoc_files(_automoc_FILES ${ARGN}) + kde4_get_automoc_files(_automoc_FILES ${_SRCS}) if (KDE4_ENABLE_FINAL) - 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}) + kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/kdeinit_${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS}) + add_library(kdeinit_${_target_NAME} SHARED ${CMAKE_CURRENT_BINARY_DIR}/kdeinit_${_target_NAME}_final_cpp.cpp ${_separate_files} ${_automoc_FILES}) else (KDE4_ENABLE_FINAL) add_library(kdeinit_${_target_NAME} SHARED ${_SRCS} ${_automoc_FILES}) @@ -597,6 +595,8 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) kde4_handle_rpath_for_library(kdeinit_${_target_NAME}) + + configure_file(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) kde4_add_executable(${_target_NAME} "${_nogui}" "${_uninst}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) target_link_libraries(${_target_NAME} kdeinit_${_target_NAME}) # endif (WIN32) |