Commit c7055ac8 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: 2.6.2 RC 3, merge in changes from main tree

parent 3497345c
......@@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES)
SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 6)
SET(CMake_VERSION_PATCH 2)
SET(CMake_VERSION_RC 2)
SET(CMake_VERSION_RC 3)
# CVS versions are odd, if this is an odd minor version
# then set the CMake_VERSION_DATE variable
IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$")
......
Changes in CMake 2.6.2 RC 3
- Fix bug, and remove extra closing > in visual fortran projects.
- Fix bug in ctest -C where it was sometimes ignored.
- Fix crash with exec_process when cmake is being debugged on windows
- Fix unsetting of global properties
Changes in CMake 2.6.2 RC 2
- allow tool chains to limit object path length
- add info.plist to frameworks
......
......@@ -79,7 +79,10 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
config = this->CTest->GetConfigType().c_str();
}
#ifdef CMAKE_INTDIR
config = CMAKE_INTDIR;
if(!config)
{
config = CMAKE_INTDIR;
}
#endif
if ( config )
......@@ -259,7 +262,10 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
config = this->CTest->GetConfigType().c_str();
}
#ifdef CMAKE_INTDIR
config = CMAKE_INTDIR;
if(!config)
{
config = CMAKE_INTDIR;
}
#endif
if(!config)
{
......
......@@ -86,7 +86,7 @@ public:
"of the property to get. "
"If the property is not set an empty value is returned. "
"If the SET option is given the variable is set to a boolean "
"value indicating whether the property has been set."
"value indicating whether the property has been set. "
"If the DEFINED option is given the variable is set to a boolean "
"value indicating whether the property has been defined "
"such as with define_property. "
......
......@@ -1788,7 +1788,7 @@ cmLocalVisualStudio7Generator
}
if(projectType)
{
fout << "\tProjectType=\"" << projectType << "\">\n";
fout << "\tProjectType=\"" << projectType << "\"\n";
}
fout<< "\tKeyword=\"" << keyword << "\">\n"
<< "\tProjectGUID=\"{" << gg->GetGUID(libName) << "}\">\n"
......
......@@ -715,18 +715,24 @@ bool cmWin32ProcessExecution::CloseHandles()
{
if(this->pStdErr != -1 )
{
// this will close this as well: this->hChildStderrRdDup
_close(this->pStdErr);
this->pStdErr = -1;
this->hChildStderrRdDup = 0;
}
if(this->pStdIn != -1 )
{
// this will close this as well: this->hChildStdinWrDup
_close(this->pStdIn);
this->pStdIn = -1;
this->hChildStdinWrDup = 0;
}
if(this->pStdOut != -1 )
{
// this will close this as well: this->hChildStdoutRdDup
_close(this->pStdOut);
this->pStdOut = -1;
this->hChildStdoutRdDup = 0;
}
bool ret = true;
......@@ -735,21 +741,7 @@ bool cmWin32ProcessExecution::CloseHandles()
ret = false;
}
this->hChildStdinRd = 0;
if(this->hChildStdoutRdDup && !CloseHandle(this->hChildStdoutRdDup))
{
ret = false;
}
this->hChildStdoutRdDup = 0;
if(this->hChildStderrRdDup && !CloseHandle(this->hChildStderrRdDup))
{
ret = false;
}
this->hChildStderrRdDup = 0;
if(this->hChildStdinWrDup && !CloseHandle(this->hChildStdinWrDup))
{
ret = false;
}
this->hChildStdinWrDup = 0;
// now close these two
if (this->hChildStdoutWr && !CloseHandle(this->hChildStdoutWr))
{
ret = false;
......
......@@ -3550,10 +3550,6 @@ void cmake::SetProperty(const char* prop, const char* value)
{
return;
}
if (!value)
{
value = "NOTFOUND";
}
this->Properties.SetProperty(prop, value, cmProperty::GLOBAL);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment