TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix multiple processing of kcfgc files in the same directory.

Browse Source 
Instead, processing into the current binary directory is performed.
This resolves FTBFS with ninja-build.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/39/head
Slávek Banko 4 years ago
parent 90c6a46c9c
commit 53214d124e
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File

8
konsolekalendar/CMakeLists.txt
Unescape View File

@ -38,18 +38,18 @@ install( FILES konsolekalendar.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
##### helper #################################### ##### helper ####################################
macro( process_kcfg _who _out _path _kcfg _kcfgc ) macro( process_kcfg _who _out _path _kcfg _kcfgc )
add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/${_path}/${_out} add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_path}/${_out}
COMMAND COMMAND
mkdir -p ${CMAKE_BINARY_DIR}/${_path} mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${_path}
COMMAND ${KDE3_KCFGC_EXECUTABLE} COMMAND ${KDE3_KCFGC_EXECUTABLE}
-d ${CMAKE_BINARY_DIR}/${_path} -d ${CMAKE_CURRENT_BINARY_DIR}/${_path}
${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg}
${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc}
DEPENDS DEPENDS
${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg}
${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} ) ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} )
set_property( SOURCE ${_who} APPEND set_property( SOURCE ${_who} APPEND
PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/${_path}/${_out} ) PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_path}/${_out} )
endmacro( ) endmacro( )

34
korganizer/CMakeLists.txt
Unescape View File

@ -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 ##### korganizer (shared) #######################
PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libkcal/htmlexportsettings.h )
process_kcfg( calendarview.cpp htmlexportsettings.h libkcal
htmlexportsettings.kcfg htmlexportsettings.kcfgc )
tde_add_library( korganizer SHARED AUTOMOC tde_add_library( korganizer SHARED AUTOMOC
META_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/korganizer META_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/korganizer

8
wizards/CMakeLists.txt
Unescape View File

@ -58,18 +58,18 @@ install( FILES
##### helper #################################### ##### helper ####################################
macro( process_kcfg _who _out _path _kcfg _kcfgc ) macro( process_kcfg _who _out _path _kcfg _kcfgc )
add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/${_path}/${_out} add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_path}/${_out}
COMMAND COMMAND
mkdir -p ${CMAKE_BINARY_DIR}/${_path} mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${_path}
COMMAND ${KDE3_KCFGC_EXECUTABLE} COMMAND ${KDE3_KCFGC_EXECUTABLE}
-d ${CMAKE_BINARY_DIR}/${_path} -d ${CMAKE_CURRENT_BINARY_DIR}/${_path}
${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg}
${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc}
DEPENDS DEPENDS
${CMAKE_SOURCE_DIR}/${_path}/${_kcfg} ${CMAKE_SOURCE_DIR}/${_path}/${_kcfg}
${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} ) ${CMAKE_SOURCE_DIR}/${_path}/${_kcfgc} )
set_property( SOURCE ${_who} APPEND set_property( SOURCE ${_who} APPEND
PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/${_path}/${_out} ) PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_path}/${_out} )
endmacro() endmacro()

Write Preview
Loading…
Cancel
Save