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

7 files changed, 24 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 899a78eef4..7f29f1ac9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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]$")
diff --git a/ChangeLog.manual b/ChangeLog.manual
index 055e630667..166b0d2043 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,9 @@
+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
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index ccd4ec1a3f..cb713a6102 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -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)
       {
diff --git a/Source/cmGetPropertyCommand.h b/Source/cmGetPropertyCommand.h
index d7503ba690..a8976c502b 100644
--- a/Source/cmGetPropertyCommand.h
+++ b/Source/cmGetPropertyCommand.h
@@ -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. "
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 088116b00e..149aa692a2 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1788,7 +1788,7 @@ cmLocalVisualStudio7Generator
     }
   if(projectType)
     {
-    fout << "\tProjectType=\"" << projectType << "\">\n";
+    fout << "\tProjectType=\"" << projectType << "\"\n";
     }
   fout<< "\tKeyword=\"" << keyword << "\">\n" 
        << "\tProjectGUID=\"{" << gg->GetGUID(libName) << "}\">\n"
diff --git a/Source/cmWin32ProcessExecution.cxx b/Source/cmWin32ProcessExecution.cxx
index 67ceaef0bf..f3838057c5 100644
--- a/Source/cmWin32ProcessExecution.cxx
+++ b/Source/cmWin32ProcessExecution.cxx
@@ -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;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 94c27bf83d..0fde396449 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -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);
 }