From 7e6826acb8463a60b4c7179841784127669f9dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 4 Feb 2020 00:55:27 +0100 Subject: Fix multiple processing of kcfgc files in the same directory. Instead, processing into the current binary directory is performed. This resolves FTBFS with ninja-build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 53214d124e4806809fabe83d614c06e3d1552089) --- korganizer/CMakeLists.txt | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'korganizer/CMakeLists.txt') diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt index b8c0d4d1..ab3b5615 100644 --- a/korganizer/CMakeLists.txt +++ b/korganizer/CMakeLists.txt @@ -158,22 +158,28 @@ tde_add_library( ${target} SHARED AUTOMOC ) -##### korganizer (shared) ####################### +##### helper #################################### + +macro( process_kcfg _who _out _path _kcfg _kcfgc ) + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_path}/${_out} + COMMAND + mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${_path} + COMMAND ${KDE3_KCFGC_EXECUTABLE} + -d ${CMAKE_CURRENT_BINARY_DIR}/${_path} + ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} + ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} + DEPENDS + ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} + ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} ) + set_property( SOURCE ${_who} APPEND + PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_path}/${_out} ) +endmacro( ) -add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libkcal/htmlexportsettings.h - COMMAND - mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/libkcal - COMMAND ${KDE3_KCFGC_EXECUTABLE} - -d ${CMAKE_CURRENT_BINARY_DIR}/libkcal - ${CMAKE_SOURCE_DIR}/libkcal/htmlexportsettings.kcfg - ${CMAKE_SOURCE_DIR}/libkcal/htmlexportsettings.kcfgc - DEPENDS - ${CMAKE_SOURCE_DIR}/libkcal/htmlexportsettings.kcfg - ${CMAKE_SOURCE_DIR}/libkcal/htmlexportsettings.kcfgc -) -set_source_files_properties( calendarview.cpp - PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libkcal/htmlexportsettings.h ) +##### korganizer (shared) ####################### + +process_kcfg( calendarview.cpp htmlexportsettings.h libkcal + htmlexportsettings.kcfg htmlexportsettings.kcfgc ) tde_add_library( korganizer SHARED AUTOMOC META_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/korganizer -- cgit v1.2.3