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

[Peter Kümmel]

SVN commit 1215960 by kuemmel:

add missing header

 M  +7 -3      INSTALL  
 M  +13 -1     cmake/CMakeLists.txt  
 M  +3 -1      src/libkstapp/primitivemodel.cpp  
 M  +1 -0      src/libkstapp/stringmodel.cpp  


--- branches/work/kst/portto4/kst/INSTALL #1215959:1215960
@@ -135,12 +135,16 @@
 	file, all listed files will be compiled separately. Sometimes this is needed because
 	of too much compiler errors, and it is simpler not to merge the file.
 
-	Adding new files
+	- Adding new files
 	When you add new files the merging files have to be rebuild:
 		cmake -Dkst_merge_rebuild=1
-	Or start over by complety cleaning the build folder.
+	  Or start over by completely  cleaning the build folder.
 
+	- Starting over with same configuration
+	  Delete all files but CMakeCache.txt and call
+		cmake .
 
+
 Packaging
 ----------
 
@@ -169,7 +173,7 @@
 	Windows, and MacOSX.
 	
 	Nice to have:
-	- add more package rules: nsis, mac-bundles
+	- add more package rules: Mac-bundles
 	- installation rules on Mac
 	- add pre-compiled headers for Mac, Xcode
 
--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1215959:1215960
@@ -33,9 +33,9 @@
 kst_option(dataobjects "Build dataobject plugins" ON all)
 kst_option(test "Build unit tests" OFF all)
 kst_option(pch "Use precompiled headers" ON all)
+kst_option(edit_cont "Enable <Edit and Continue> for Visual Studio" OFF win)
 
 
-
 message(STATUS)
 
 # Find 3rd party libraries
@@ -125,6 +125,18 @@
 	add_definitions(-D_USE_MATH_DEFINES)
 endif()
 
+if(MSVC_IDE AND (kst_edit_cont OR kst_merge_files))
+	# Enable <Edit and Continue> in Visual Studio
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI")
+	if(kst_pch)
+		# Studio bug: <Visual Studio 2005 "Force Includes" Breaks Edit and Continue with Pre-compiled Headers>
+		set(kst_pch 0 CACHE BOOL "Disable pch because of Edit&Continue" FORCE)
+	endif()
+	message(STATUS "# Studio bug: Visual Studio 2005 Force Includes Breaks Edit and Continue with Pre-compiled Headers")
+endif()
+
+
+
 if(WIN32)
 	set(kst_debug_postfix d)
 endif()
--- branches/work/kst/portto4/kst/src/libkstapp/primitivemodel.cpp #1215959:1215960
@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
 *                                                                         *
 *   copyright : (C) 2011 The University of Toronto                        *
 *                   netterfield at astro.utoronto.ca                         *
@@ -21,6 +21,8 @@
 #include <generatedmatrix.h>
 #include <datasource.h>
 
+#include <QFileInfo>
+
 namespace Kst {
 
 PrimitiveTreeItem::PrimitiveTreeItem(const QList<QVariant> &data, PrimitiveTreeItem *parent) {
--- branches/work/kst/portto4/kst/src/libkstapp/stringmodel.cpp #1215959:1215960
@@ -33,6 +33,7 @@
     return;
   }
 
+
   strings.sort();
   foreach(const QString& str, strings) {
     QString value;