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

[Peter Kümmel]

SVN commit 1214835 by kuemmel:

place .h and .cpp files side by side in the Studio project

 M  +5 -1      KstMacros.cmake  


--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1214834:1214835
@@ -60,6 +60,7 @@
 	target_link_libraries(${kst_name} ${kst_qtmain_library})
 	kst_set_target_properties()
 	add_dependencies(${kst_name} ${kst_revision_project})
+	kst_flat_source_group(${kst_${kst_name}_headers} ${kst_${kst_name}_sources_not_generated})
 endmacro()
 
 
@@ -87,16 +88,17 @@
 		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} ${kst_${kst_name}_sources_not_generated} ${svnversion_h})
+		kst_add_info_files(Headers/Sources ${kst_${kst_name}_sources_not_generated})		
 	else()
 		add_library(${kst_name} ${type} ${kst_${kst_name}_sources} ${kst_${kst_name}_headers} ${svnversion_h})
 	endif()
 	kst_set_target_properties()
+	kst_flat_source_group(${kst_${kst_name}_headers} ${kst_${kst_name}_sources_not_generated})
 	add_dependencies(${kst_name} ${kst_revision_project})
 	if(WIN32)
 		install(TARGETS ${kst_name} RUNTIME DESTINATION bin
@@ -130,6 +132,7 @@
 	install(TARGETS ${kst_name} LIBRARY DESTINATION plugin)
 	kst_find_install_desktop_file(${kst_plugin_dir}/${folder}/${name})
 	add_dependencies(${kst_binary_name} ${kst_name})
+	kst_flat_source_group(${kst_${kst_name}_headers} ${kst_${kst_name}_sources_not_generated})
 	if(kst_verbose)
 	  message(STATUS "Building plugin ${kst_name}")
 	endif()
@@ -239,6 +242,7 @@
 	source_group("Source Files" Files)
 	source_group("Header Files" Files)
 	source_group("CMakeLists" FILES CMakeLists.txt)
+	source_group("Headers/Sources" FILES ${ARGN})
 endmacro()