SVN commit 1028994 by helio: - Proper handle custom target instead of using macros. Fix issue with duplicate name with cmake 2.8 rc1 M +7 -10 CMakeLists.txt M +2 -1 backend/CMakeLists.txt M +2 -1 kfrontend/CMakeLists.txt --- trunk/KDE/kdebase/workspace/kdm/CMakeLists.txt #1028993:1028994 @@ -12,17 +12,14 @@ set(confci ${CMAKE_CURRENT_BINARY_DIR}/config.ci) macro_additional_clean_files( ${confci} ) -macro(build_confci) - add_custom_command( - OUTPUT ${confci} - COMMAND ${PERL_EXECUTABLE} -w ${confproc} ${confdef} ${confci} - MAIN_DEPENDENCY ${confdef} - DEPENDS ${confproc} - ) -endmacro(build_confci) +add_custom_command( + OUTPUT ${confci} + COMMAND ${PERL_EXECUTABLE} -w ${confproc} ${confdef} ${confci} + MAIN_DEPENDENCY ${confdef} + DEPENDS ${confproc} +) -build_confci() -add_custom_target(config.ci DEPENDS ${confci}) +add_custom_target(ConfigCi DEPENDS ${confci}) ### this is *only* for the kdm home page maintainer! ### ADD_CUSTOM_TARGET(hp scp --- trunk/KDE/kdebase/workspace/kdm/backend/CMakeLists.txt #1028993:1028994 @@ -74,6 +74,7 @@ macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/kdm_final_cpp.cpp ${confci}) endif(KDE4_ENABLE_FINAL) +add_dependencies( kdm ConfigCi ) + install(TARGETS kdm ${INSTALL_TARGETS_DEFAULT_ARGS}) -build_confci() --- trunk/KDE/kdebase/workspace/kdm/kfrontend/CMakeLists.txt #1028993:1028994 @@ -103,9 +103,10 @@ kde4_add_executable(kdmctl ${kdmctl_SRCS}) macro_add_compile_flags(kdmctl -U_REENTRANT) target_link_libraries(kdmctl ${SOCKET_LIBRARIES}) +add_dependencies(kdmctl ConfigCi) + install(TARGETS kdmctl ${INSTALL_TARGETS_DEFAULT_ARGS}) -build_confci() ## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h) install(CODE "