From 374db6339a27adfaf1bf170c503828ebd514a9d5 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 4 Nov 2016 16:18:45 +0000 Subject: [PATCH] do not add .qrc and .ui files to target sources when KATIE_ALLINONE is not set Signed-off-by: Ivailo Monev --- cmake/modules/KatieBuildMacros.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 9ea82c137..0518c3861 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -172,7 +172,14 @@ function(KATIE_SETUP_TARGET FORTARGET) set_source_files_properties(${resourcesdep} PROPERTIES OBJECT_DEPENDS "${targetresources}") if(NOT KATIE_ALLINONE) - set(${FORTARGET}_SOURCES ${resourcesdep} ${ARGN} PARENT_SCOPE) + set(filteredsources) + foreach(srcstring ${ARGN}) + get_filename_component(srcname ${srcstring} EXT) + if(NOT "${srcname}" MATCHES "(.qrc|.ui)") + set(filteredsources ${filteredsources} ${srcstring}) + endif() + endforeach() + set(${FORTARGET}_SOURCES ${resourcesdep} ${filteredsources} PARENT_SCOPE) elseif("${FORTARGET}" STREQUAL "KtGui") katie_warning("All-in-one build not yet support for: ${FORTARGET}") set(${FORTARGET}_SOURCES ${resourcesdep} ${ARGN} PARENT_SCOPE) -- 2.11.0