[cmake-commits] hoffman committed cmCTest.cxx 1.300.2.4 1.300.2.5
cmIfCommand.h 1.32.2.5 1.32.2.6 cmListFileCache.h 1.17 1.17.2.1
cmLocalGenerator.cxx 1.132.2.11 1.132.2.12
cmLocalVisualStudio7Generator.cxx 1.125.2.12 1.125.2.13
cmMakefile.cxx 1.335.2.12 1.335.2.13
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 17 14:41:54 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv9830/Source
Modified Files:
Tag: CMake-2-4
cmCTest.cxx cmIfCommand.h cmListFileCache.h
cmLocalGenerator.cxx cmLocalVisualStudio7Generator.cxx
cmMakefile.cxx
Log Message:
ENH: merge in changes from main tree
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.125.2.12
retrieving revision 1.125.2.13
diff -u -d -r1.125.2.12 -r1.125.2.13
--- cmLocalVisualStudio7Generator.cxx 16 Mar 2007 22:05:42 -0000 1.125.2.12
+++ cmLocalVisualStudio7Generator.cxx 17 May 2007 18:41:52 -0000 1.125.2.13
@@ -544,9 +544,9 @@
this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
// Add a definition for the configuration name.
- std::string configDefine = "CMAKE_INTDIR=\\\"";
+ std::string configDefine = "CMAKE_INTDIR=\"";
configDefine += configName;
- configDefine += "\\\"";
+ configDefine += "\"";
targetOptions.AddDefine(configDefine);
// Add a definition for the export macro.
@@ -1872,14 +1872,13 @@
for(std::vector<cmStdString>::const_iterator di = this->Defines.begin();
di != this->Defines.end(); ++di)
{
- // Escape this flag for the IDE.
- std::string define =
- cmLocalVisualStudio7GeneratorEscapeForXML(di->c_str());
-
- // Old comment:
// Double-quotes in the value of the definition must be escaped
- // with a backslash. The entire definition should be quoted in
- // the generated xml attribute to avoid confusing the VS parser.
+ // with a backslash.
+ std::string define = di->c_str();
+ cmSystemTools::ReplaceString(define, "\"", "\\\"");
+
+ // Escape this flag for the IDE.
+ define = cmLocalVisualStudio7GeneratorEscapeForXML(define.c_str());
// Write this flag. Quote it if the definition is not
// alphanumeric.
Index: cmIfCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIfCommand.h,v
retrieving revision 1.32.2.5
retrieving revision 1.32.2.6
diff -u -d -r1.32.2.5 -r1.32.2.6
--- cmIfCommand.h 15 Feb 2007 17:45:07 -0000 1.32.2.5
+++ cmIfCommand.h 17 May 2007 18:41:52 -0000 1.32.2.6
@@ -99,6 +99,11 @@
" COMMAND1(ARGS ...)\n"
" COMMAND2(ARGS ...)\n"
" ...\n"
+ " ELSEIF(expression2)\n"
+ " # ELSEIF section.\n"
+ " COMMAND1(ARGS ...)\n"
+ " COMMAND2(ARGS ...)\n"
+ " ...\n"
" ELSE(expression)\n"
" # ELSE section.\n"
" COMMAND1(ARGS ...)\n"
@@ -107,8 +112,9 @@
" ENDIF(expression)\n"
"Evaluates the given expression. If the result is true, the commands "
"in the THEN section are invoked. Otherwise, the commands in the "
- "ELSE section are invoked. The ELSE section is optional. Note that "
- "the same expression must be given to IF, ELSE, and ENDIF. Long "
+ "ELSE section are invoked. The ELSEIF and ELSE sections are "
+ "optional. You may have multiple ELSEIF clauses. Note that "
+ "the same expression must be given to IF, and ENDIF. Long "
"expressions can be used and the order or precedence is that the "
"EXISTS, COMMAND, and DEFINED operators will be evaluated first. "
"Then any EQUAL, LESS, GREATER, STRLESS, STRGREATER, STREQUAL, MATCHES "
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.132.2.11
retrieving revision 1.132.2.12
diff -u -d -r1.132.2.11 -r1.132.2.12
--- cmLocalGenerator.cxx 16 Mar 2007 22:05:42 -0000 1.132.2.11
+++ cmLocalGenerator.cxx 17 May 2007 18:41:52 -0000 1.132.2.12
@@ -1467,6 +1467,8 @@
// Some search paths should never be emitted
emitted.insert("");
emitted.insert("/usr/lib");
+ emitted.insert("/usr/lib32");
+ emitted.insert("/usr/lib64");
std::string libPathFlag =
this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
std::string libLinkFlag =
Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.300.2.4
retrieving revision 1.300.2.5
diff -u -d -r1.300.2.4 -r1.300.2.5
--- cmCTest.cxx 27 Oct 2006 20:01:47 -0000 1.300.2.4
+++ cmCTest.cxx 17 May 2007 18:41:52 -0000 1.300.2.5
@@ -57,6 +57,12 @@
{
struct tm* lctime;
time_t tctime = time(0);
+ lctime = gmtime(&tctime);
+ char buf[1024];
+ // add todays year day and month to the time in str because
+ // curl_getdate no longer assumes the day is today
+ sprintf(buf, "%d%02d%02d %s", lctime->tm_year+1900, lctime->tm_mday,
+ lctime->tm_mon, str.c_str());
cmCTestLog(this, OUTPUT, "Determine Nightly Start Time" << std::endl
<< " Specified time: " << str.c_str() << std::endl);
//Convert the nightly start time to seconds. Since we are
Index: cmListFileCache.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmListFileCache.h,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- cmListFileCache.h 15 Mar 2006 16:02:04 -0000 1.17
+++ cmListFileCache.h 17 May 2007 18:41:52 -0000 1.17.2.1
@@ -28,7 +28,7 @@
struct cmListFileArgument
{
- cmListFileArgument(): Value(), Quoted(false), FilePath(0), Line(0) {}
+ cmListFileArgument(): Value(), Quoted(false), FilePath(), Line(0) {}
cmListFileArgument(const cmListFileArgument& r):
Value(r.Value), Quoted(r.Quoted), FilePath(r.FilePath), Line(r.Line) {}
cmListFileArgument(const std::string& v, bool q, const char* file,
@@ -44,7 +44,7 @@
}
std::string Value;
bool Quoted;
- const char* FilePath;
+ std::string FilePath;
long Line;
};
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.335.2.12
retrieving revision 1.335.2.13
diff -u -d -r1.335.2.12 -r1.335.2.13
--- cmMakefile.cxx 15 Feb 2007 18:36:08 -0000 1.335.2.12
+++ cmMakefile.cxx 17 May 2007 18:41:52 -0000 1.335.2.13
@@ -461,7 +461,9 @@
cmListFile cacheFile;
if( !cacheFile.ParseFile(filenametoread, requireProjectCommand) )
{
- this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentFile.c_str());
+ // pop the listfile off the stack
+ this->ListFileStack.pop_back();
+ this->AddDefinition("CMAKE_CURRENT_LIST_FILE", currentFile.c_str());
return false;
}
// add this list file to the list of dependencies
@@ -1900,7 +1902,7 @@
// Expand the variables in the argument.
value = i->Value;
this->ExpandVariablesInString(value, false, false, false,
- i->FilePath, i->Line,
+ i->FilePath.c_str(), i->Line,
false, true);
// If the argument is quoted, it should be one argument.
@@ -2706,15 +2708,18 @@
std::string cmMakefile::GetListFileStack()
{
- std::string tmp;
- for (std::deque<cmStdString>::iterator i = this->ListFileStack.begin();
- i != this->ListFileStack.end(); ++i)
+ cmOStringStream tmp;
+ size_t depth = this->ListFileStack.size();
+ std::deque<cmStdString>::iterator it = this->ListFileStack.end();
+ do
{
- if (i != this->ListFileStack.begin())
- {
- tmp += ";";
- }
- tmp += *i;
+ --it;
+ tmp << "\n[";
+ tmp << depth;
+ tmp << "]\t";
+ tmp << *it;
+ depth--;
}
- return tmp;
+ while (it != this->ListFileStack.begin());
+ return tmp.str();
}
More information about the Cmake-commits
mailing list