[cmake-commits] king committed cmLocalVisualStudio7Generator.cxx
1.167 1.168
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Feb 15 12:23:44 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv2621
Modified Files:
cmLocalVisualStudio7Generator.cxx
Log Message:
BUG: Do not hack the exception handling default for linker flags or for per-source-file flags.
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- cmLocalVisualStudio7Generator.cxx 1 Feb 2007 22:06:05 -0000 1.167
+++ cmLocalVisualStudio7Generator.cxx 15 Feb 2007 17:23:42 -0000 1.168
@@ -429,6 +429,9 @@
// Store options from command line flags.
void Parse(const char* flags);
+ // Fix the ExceptionHandling option to default to off.
+ void FixExceptionHandlingDefault();
+
// Store options for verbose builds.
void SetVerboseMakefile(bool verbose);
@@ -554,6 +557,7 @@
// Construct a set of build options for this target.
Options targetOptions(Options::Compiler);
+ targetOptions.FixExceptionHandlingDefault();
targetOptions.Parse(flags.c_str());
targetOptions.Parse(defineFlags.c_str());
targetOptions.SetVerboseMakefile(
@@ -1696,7 +1700,11 @@
this->FlagTable = cmLocalVisualStudio7GeneratorLinkFlagTable; break;
default: break;
}
+}
+//----------------------------------------------------------------------------
+void cmLocalVisualStudio7GeneratorOptions::FixExceptionHandlingDefault()
+{
// Exception handling is on by default because the platform file has
// "/EHsc" in the flags. Normally, that will override this
// initialization to off, but the user has the option of removing
More information about the Cmake-commits
mailing list