[cmake-commits] hoffman committed cmCTest.cxx 1.300.2.5 1.300.2.6
cmGlobalUnixMakefileGenerator3.cxx 1.56.2.9 1.56.2.10
cmGlobalVisualStudio7Generator.cxx 1.70.2.7 1.70.2.8
cmGlobalVisualStudio8Generator.cxx 1.10.2.5 1.10.2.6
cmLocalVisualStudio7Generator.cxx 1.125.2.13 1.125.2.14
cmTarget.cxx 1.96.2.9 1.96.2.10
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Dec 4 17:14:08 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv30792/Source
Modified Files:
Tag: CMake-2-4
cmCTest.cxx cmGlobalUnixMakefileGenerator3.cxx
cmGlobalVisualStudio7Generator.cxx
cmGlobalVisualStudio8Generator.cxx
cmLocalVisualStudio7Generator.cxx cmTarget.cxx
Log Message:
ENH: merge in fixes from main tree
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.125.2.13
retrieving revision 1.125.2.14
diff -u -d -r1.125.2.13 -r1.125.2.14
--- cmLocalVisualStudio7Generator.cxx 17 May 2007 18:41:52 -0000 1.125.2.13
+++ cmLocalVisualStudio7Generator.cxx 4 Dec 2007 22:14:05 -0000 1.125.2.14
@@ -359,9 +359,6 @@
{"EnableFunctionLevelLinking", "Gy",
"EnableFunctionLevelLinking", "TRUE", 0},
{"EnableIntrinsicFunctions", "Oi", "EnableIntrinsicFunctions", "TRUE", 0},
- {"ExceptionHandling", "EHsc", "enable c++ exceptions", "TRUE", 0},
- {"ExceptionHandling", "EHa", "enable c++ exceptions", "2", 0},
- {"ExceptionHandling", "GX", "enable c++ exceptions", "TRUE", 0},
{"GlobalOptimizations", "Og", "Global Optimize", "TRUE", 0},
{"ImproveFloatingPointConsistency", "Op",
"ImproveFloatingPointConsistency", "TRUE", 0},
Index: cmGlobalVisualStudio8Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.cxx,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -d -r1.10.2.5 -r1.10.2.6
--- cmGlobalVisualStudio8Generator.cxx 16 Mar 2007 22:05:42 -0000 1.10.2.5
+++ cmGlobalVisualStudio8Generator.cxx 4 Dec 2007 22:14:05 -0000 1.10.2.6
@@ -258,6 +258,12 @@
{"PrecompiledHeaderThrough", "Yu", "Precompiled Header Name", "",
cmVS7FlagTable::UserValueRequired},
// There is no YX option in the VS8 IDE.
+
+ // Exception handling mode. If no entries match, it will be FALSE.
+ {"ExceptionHandling", "GX", "enable c++ exceptions", "1", 0},
+ {"ExceptionHandling", "EHsc", "enable c++ exceptions", "1", 0},
+ {"ExceptionHandling", "EHa", "enable SEH exceptions", "2", 0},
+
{0,0,0,0,0}
};
cmVS7FlagTable const* cmGlobalVisualStudio8Generator::GetExtraFlagTableVS8()
Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.56.2.9
retrieving revision 1.56.2.10
diff -u -d -r1.56.2.9 -r1.56.2.10
--- cmGlobalUnixMakefileGenerator3.cxx 13 Oct 2006 14:52:02 -0000 1.56.2.9
+++ cmGlobalUnixMakefileGenerator3.cxx 4 Dec 2007 22:14:05 -0000 1.56.2.10
@@ -861,11 +861,15 @@
lg->WriteMakeRule(ruleFileStream,
"Pre-install relink rule for target.",
localName.c_str(), depends, commands, true);
- depends.clear();
- depends.push_back(localName);
- commands.clear();
- lg->WriteMakeRule(ruleFileStream, "Prepare target for install.",
- "preinstall", depends, commands, true);
+
+ if (!exclude && t->second.IsInAll())
+ {
+ depends.clear();
+ depends.push_back(localName);
+ commands.clear();
+ lg->WriteMakeRule(ruleFileStream, "Prepare target for install.",
+ "preinstall", depends, commands, true);
+ }
}
// add the clean rule
Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.300.2.5
retrieving revision 1.300.2.6
diff -u -d -r1.300.2.5 -r1.300.2.6
--- cmCTest.cxx 17 May 2007 18:41:52 -0000 1.300.2.5
+++ cmCTest.cxx 4 Dec 2007 22:14:05 -0000 1.300.2.6
@@ -314,9 +314,12 @@
<< " Build name: " << this->GetCTestConfiguration("BuildName")
<< std::endl);
cmCTestLog(this, DEBUG, "Produce XML is on" << std::endl);
- if ( this->GetCTestConfiguration("NightlyStartTime").empty() )
+ if ( this->TestModel == cmCTest::NIGHTLY &&
+ this->GetCTestConfiguration("NightlyStartTime").empty() )
{
- cmCTestLog(this, DEBUG, "No nightly start time" << std::endl);
+ cmCTestLog(this, WARNING,
+ "WARNING: No nightly start time found please set in"
+ " CTestConfig.cmake or DartConfig.cmake" << std::endl);
cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::endl);
return 0;
}
@@ -1191,6 +1194,13 @@
//----------------------------------------------------------------------
void cmCTest::StartXML(std::ostream& ostr)
{
+ if(this->CurrentTag.empty())
+ {
+ cmCTestLog(this, ERROR_MESSAGE,
+ "Current Tag empty, this may mean"
+ " NightlStartTime was not set correctly." << std::endl);
+ cmSystemTools::SetFatalErrorOccured();
+ }
ostr << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
<< "<Site BuildName=\"" << this->GetCTestConfiguration("BuildName")
<< "\" BuildStamp=\"" << this->CurrentTag << "-"
Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.96.2.9
retrieving revision 1.96.2.10
diff -u -d -r1.96.2.9 -r1.96.2.10
--- cmTarget.cxx 5 Feb 2007 18:21:32 -0000 1.96.2.9
+++ cmTarget.cxx 4 Dec 2007 22:14:05 -0000 1.96.2.10
@@ -915,16 +915,22 @@
const char* cmTarget::GetLocation(const char* config)
{
- this->Location = this->GetDirectory();
+ this->Location = this->GetDirectory(config);
if(!this->Location.empty())
{
this->Location += "/";
}
- const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
- if(cfgid && strcmp(cfgid, ".") != 0)
+ if(!config)
{
- this->Location += cfgid;
- this->Location += "/";
+ // No specific configuration was given so it will not appear on
+ // the result of GetDirectory. Add a name here to be replaced at
+ // build time.
+ const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
+ if(cfgid && strcmp(cfgid, ".") != 0)
+ {
+ this->Location += cfgid;
+ this->Location += "/";
+ }
}
this->Location += this->GetFullName(config, false);
return this->Location.c_str();
Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.70.2.7
retrieving revision 1.70.2.8
diff -u -d -r1.70.2.7 -r1.70.2.8
--- cmGlobalVisualStudio7Generator.cxx 16 Mar 2007 22:05:42 -0000 1.70.2.7
+++ cmGlobalVisualStudio7Generator.cxx 4 Dec 2007 22:14:05 -0000 1.70.2.8
@@ -836,7 +836,15 @@
{"UsePrecompiledHeader", "Yu", "Use Precompiled Header", "3",
cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
{"PrecompiledHeaderThrough", "Yu", "Precompiled Header Name", "",
- cmVS7FlagTable::UserValueRequired},
+ cmVS7FlagTable::UserValueRequired},
+
+ // Exception handling mode. If no entries match, it will be FALSE.
+ {"ExceptionHandling", "GX", "enable c++ exceptions", "TRUE", 0},
+ {"ExceptionHandling", "EHsc", "enable c++ exceptions", "TRUE", 0},
+ // The EHa option does not have an IDE setting. Let it go to false,
+ // and have EHa passed on the command line by leaving out the table
+ // entry.
+
{0,0,0,0,0}
};
cmVS7FlagTable const* cmGlobalVisualStudio7Generator::GetExtraFlagTableVS7()
More information about the Cmake-commits
mailing list