[Kst] branches/work/kst/portto4/kst/cmake/modules

[Peter Kümmel]

SVN commit 1213479 by kuemmel:

cmake: add merged files as info file to project so they are editable and debugable by the IDE

 M  +4 -1      KstMacros.cmake  


--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1213478:1213479
@@ -23,6 +23,7 @@
 	qt4_wrap_cpp(_mocs ${_headers} OPTIONS "-nw")
 	set(_uis)
 	qt4_wrap_ui(_uis ${_ui_files})
+	set(kst_${kst_name}_sources_not_generated ${_sources} ${_sources_cpp})
 	set(kst_${kst_name}_sources ${_sources} ${_sources_cpp} ${_mocs} ${_uis})
 	set(kst_${kst_name}_headers ${_headers})
 	set(kst_${kst_name}_mocs    ${_mocs})
@@ -52,11 +53,13 @@
 		endif()
 		kst_files_remove(kst_${kst_name}_sources ${kst_${kst_name}_dont_merge})
 		kst_files_remove(kst_${kst_name}_dont_merge ${kst_${kst_name}_ignore})
+		kst_files_remove(kst_${kst_name}_sources_not_generated ${kst_${kst_name}_dont_merge})
+		kst_add_info_files(MergedFiles ${kst_${kst_name}_sources_not_generated})
 		merged_files_build(merged kst_${kst_name}_sources)
 		set(depends_moc_uic ${kst_${kst_name}_headers} ${kst_${kst_name}_uis} ${kst_${kst_name}_ui_files} ${kst_${kst_name}_mocs})
 		set_source_files_properties(merged_const.cpp   PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
 		set_source_files_properties(merged_touched.cpp PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
-		add_library(${kst_name} ${type} ${merged_files} ${kst_${kst_name}_dont_merge} ${kst_${kst_name}_headers} ${kst_${kst_name}_uis})
+		add_library(${kst_name} ${type} ${merged_files} ${kst_${kst_name}_dont_merge} ${kst_${kst_name}_headers} ${kst_${kst_name}_uis} ${kst_${kst_name}_sources_not_generated})
 	else()		
 		add_library(${kst_name} ${type} ${kst_${kst_name}_sources} ${kst_${kst_name}_headers})
 	endif()