[Cmake-commits] [cmake-commits] hoffman committed cmGetPropertyCommand.h 1.6.2.1 1.6.2.2 cmLocalVisualStudio7Generator.cxx 1.217.2.9 1.217.2.10 cmWin32ProcessExecution.cxx 1.32 1.32.2.1 cmake.cxx 1.375.2.12 1.375.2.13

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv5965/Source

Modified Files:
      Tag: CMake-2-6
	cmGetPropertyCommand.h cmLocalVisualStudio7Generator.cxx 
	cmWin32ProcessExecution.cxx cmake.cxx 
Log Message:
ENH: 2.6.2 RC 3, merge in changes from main tree


Index: cmWin32ProcessExecution.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmWin32ProcessExecution.cxx,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C 2 -d -r1.32 -r1.32.2.1
*** cmWin32ProcessExecution.cxx	27 Sep 2007 18:16:20 -0000	1.32
--- cmWin32ProcessExecution.cxx	4 Sep 2008 21:10:45 -0000	1.32.2.1
***************
*** 716,731 ****
--- 716,737 ----
    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;
      }
  
***************
*** 736,754 ****
      }
    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;
    if (this->hChildStdoutWr && !CloseHandle(this->hChildStdoutWr))
      {
--- 742,746 ----
      }
    this->hChildStdinRd = 0;
!   // now close these two
    if (this->hChildStdoutWr && !CloseHandle(this->hChildStdoutWr))
      {

Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.217.2.9
retrieving revision 1.217.2.10
diff -C 2 -d -r1.217.2.9 -r1.217.2.10
*** cmLocalVisualStudio7Generator.cxx	6 Aug 2008 21:04:19 -0000	1.217.2.9
--- cmLocalVisualStudio7Generator.cxx	4 Sep 2008 21:10:45 -0000	1.217.2.10
***************
*** 1789,1793 ****
    if(projectType)
      {
!     fout << "\tProjectType=\"" << projectType << "\">\n";
      }
    fout<< "\tKeyword=\"" << keyword << "\">\n" 
--- 1789,1793 ----
    if(projectType)
      {
!     fout << "\tProjectType=\"" << projectType << "\"\n";
      }
    fout<< "\tKeyword=\"" << keyword << "\">\n" 

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.375.2.12
retrieving revision 1.375.2.13
diff -C 2 -d -r1.375.2.12 -r1.375.2.13
*** cmake.cxx	3 Sep 2008 13:43:18 -0000	1.375.2.12
--- cmake.cxx	4 Sep 2008 21:10:45 -0000	1.375.2.13
***************
*** 3551,3558 ****
      return;
      }
-   if (!value)
-     {
-     value = "NOTFOUND";
-     }
  
    this->Properties.SetProperty(prop, value, cmProperty::GLOBAL);
--- 3551,3554 ----

Index: cmGetPropertyCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGetPropertyCommand.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C 2 -d -r1.6.2.1 -r1.6.2.2
*** cmGetPropertyCommand.h	2 Apr 2008 13:16:03 -0000	1.6.2.1
--- cmGetPropertyCommand.h	4 Sep 2008 21:10:44 -0000	1.6.2.2
***************
*** 87,91 ****
          "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."
          "If the DEFINED option is given the variable is set to a boolean "
          "value indicating whether the property has been defined "
--- 87,91 ----
          "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.  "
          "If the DEFINED option is given the variable is set to a boolean "
          "value indicating whether the property has been defined "