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

[Peter Kümmel]

SVN commit 1205849 by kuemmel:

cmake: also build with merged files on mac and Xcode

 M  +5 -6      KstMacros.cmake  


--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1205848:1205849
@@ -47,11 +47,10 @@
 	add_definitions(-D${_build_macro})
 	if(kst_merge_files)
 		if(kst_merge_rebuild)
-			set(merged_files_rebuild 0)
+			set(merged_files_rebuild 1)
 		endif()
-		foreach(_it ${kst_${kst_name}_dont_merge})
-			list(REMOVE_ITEM kst_${kst_name}_sources ${_it})
-		endforeach()
+		kst_files_remove(kst_${kst_name}_sources ${kst_${kst_name}_dont_merge})
+		kst_files_remove(kst_${kst_name}_dont_merge ${kst_${kst_name}_ignore})
 		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}")
@@ -65,7 +64,7 @@
 
 
 macro(kst_init_plugin dir)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugin)
+	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugin)
 	include_directories(${CMAKE_BINARY_DIR}/${dir})
 	kst_include_directories(kstcore kstmath kstwidgets)
 	set(kst_plugin_dir ${dir})
@@ -107,7 +106,7 @@
 	foreach(_item ${ARGN})
 		set(_file ${kst_${kst_name}_folder}/${_item})
 		if(${list})
-			list(REMOVE_ITEM ${list} ${_file}.cpp ${_file}.c ${_file}.h)
+			list(REMOVE_ITEM ${list} ${_item} ${_file} ${_file}.cpp ${_file}.c ${_file}.h)
 		endif()
 	endforeach()
 endmacro()