[Cmake-commits] [cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.232.2.3 1.232.2.4 cmMakefile.cxx 1.521.2.2 1.521.2.3 cmSystemTools.cxx 1.401.2.2 1.401.2.3 cmTarget.cxx 1.271.2.2 1.271.2.3

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Nov 3 17:25:06 EST 2009


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

Modified Files:
      Tag: CMake-2-8
	cmGlobalXCodeGenerator.cxx cmMakefile.cxx cmSystemTools.cxx 
	cmTarget.cxx 
Log Message:
CMake 2.8.0-rc5


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.232.2.3
retrieving revision 1.232.2.4
diff -C 2 -d -r1.232.2.3 -r1.232.2.4
*** cmGlobalXCodeGenerator.cxx	28 Oct 2009 16:15:15 -0000	1.232.2.3
--- cmGlobalXCodeGenerator.cxx	3 Nov 2009 22:25:02 -0000	1.232.2.4
***************
*** 1282,1286 ****
  {
    std::string makefileName=makefileBasename;
!   makefileName+=configName;
    cmGeneratedFileStream makefileStream(makefileName.c_str());
    if(!makefileStream)
--- 1282,1289 ----
  {
    std::string makefileName=makefileBasename;
!   if(this->XcodeVersion > 20)
!     {
!     makefileName+=configName;
!     }
    cmGeneratedFileStream makefileStream(makefileName.c_str());
    if(!makefileStream)

Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.401.2.2
retrieving revision 1.401.2.3
diff -C 2 -d -r1.401.2.2 -r1.401.2.3
*** cmSystemTools.cxx	9 Oct 2009 20:11:19 -0000	1.401.2.2
--- cmSystemTools.cxx	3 Nov 2009 22:25:02 -0000	1.401.2.3
***************
*** 47,51 ****
  #if defined(CMAKE_BUILD_WITH_CMAKE)
  #  include <libtar/libtar.h>
- #  include <memory> // auto_ptr
  #  include <fcntl.h>
  #  include <cm_zlib.h>
--- 47,50 ----
***************
*** 1808,1814 ****
    };
  
!   // Ok, this libtar is not const safe. for now use auto_ptr hack
    char* realName = new char[ strlen(outFileName) + 1 ];
-   std::auto_ptr<char> realNamePtr(realName);
    strcpy(realName, outFileName);
    int options = 0;
--- 1807,1812 ----
    };
  
!   // This libtar is not const safe. Make a non-const copy of outFileName
    char* realName = new char[ strlen(outFileName) + 1 ];
    strcpy(realName, outFileName);
    int options = 0;
***************
*** 1826,1832 ****
--- 1824,1833 ----
      {
      cmSystemTools::Error("Problem with tar_open(): ", strerror(errno));
+     delete [] realName;
      return false;
      }
  
+   delete [] realName;
+ 
    std::vector<cmStdString>::const_iterator it;
    for (it = files.begin(); it != files.end(); ++ it )
***************
*** 1860,1863 ****
--- 1861,1865 ----
      return false;
      }
+ 
    return true;
  #else
***************
*** 1887,1893 ****
    };
  
!   // Ok, this libtar is not const safe. for now use auto_ptr hack
    char* realName = new char[ strlen(outFileName) + 1 ];
-   std::auto_ptr<char> realNamePtr(realName);
    strcpy(realName, outFileName);
    if (tar_open(&t, realName,
--- 1889,1894 ----
    };
  
!   // This libtar is not const safe. Make a non-const copy of outFileName
    char* realName = new char[ strlen(outFileName) + 1 ];
    strcpy(realName, outFileName);
    if (tar_open(&t, realName,
***************
*** 1902,1908 ****
--- 1903,1912 ----
      {
      cmSystemTools::Error("Problem with tar_open(): ", strerror(errno));
+     delete [] realName;
      return false;
      }
  
+   delete [] realName;
+ 
    if (tar_extract_all(t, 0) != 0)
    {
***************
*** 1941,1947 ****
    };
  
!   // Ok, this libtar is not const safe. for now use auto_ptr hack
    char* realName = new char[ strlen(outFileName) + 1 ];
-   std::auto_ptr<char> realNamePtr(realName);
    strcpy(realName, outFileName);
    if (tar_open(&t, realName,
--- 1945,1950 ----
    };
  
!   // This libtar is not const safe. Make a non-const copy of outFileName
    char* realName = new char[ strlen(outFileName) + 1 ];
    strcpy(realName, outFileName);
    if (tar_open(&t, realName,
***************
*** 1956,1962 ****
--- 1959,1968 ----
      {
      cmSystemTools::Error("Problem with tar_open(): ", strerror(errno));
+     delete [] realName;
      return false;
      }
  
+   delete [] realName;
+ 
    while ((th_read(t)) == 0)
    {

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.271.2.2
retrieving revision 1.271.2.3
diff -C 2 -d -r1.271.2.2 -r1.271.2.3
*** cmTarget.cxx	9 Oct 2009 20:11:19 -0000	1.271.2.2
--- cmTarget.cxx	3 Nov 2009 22:25:02 -0000	1.271.2.3
***************
*** 882,909 ****
       "All Windows-based systems including Cygwin are DLL platforms."
  
    cm->DefineProperty
      ("ARCHIVE_OUTPUT_DIRECTORY", cmProperty::TARGET,
       "Output directory in which to build ARCHIVE target files.",
!      "This property specifies the directory into which archive target files "
!      "should be built. "
!      CM_TARGET_FILE_TYPES_DOC " "
!      "This property is initialized by the value of the variable "
!      "CMAKE_ARCHIVE_OUTPUT_DIRECTORY if it is set when a target is created.");
    cm->DefineProperty
      ("LIBRARY_OUTPUT_DIRECTORY", cmProperty::TARGET,
       "Output directory in which to build LIBRARY target files.",
!      "This property specifies the directory into which library target files "
!      "should be built. "
!      CM_TARGET_FILE_TYPES_DOC " "
!      "This property is initialized by the value of the variable "
!      "CMAKE_LIBRARY_OUTPUT_DIRECTORY if it is set when a target is created.");
    cm->DefineProperty
      ("RUNTIME_OUTPUT_DIRECTORY", cmProperty::TARGET,
       "Output directory in which to build RUNTIME target files.",
!      "This property specifies the directory into which runtime target files "
!      "should be built. "
!      CM_TARGET_FILE_TYPES_DOC " "
!      "This property is initialized by the value of the variable "
!      "CMAKE_RUNTIME_OUTPUT_DIRECTORY if it is set when a target is created.");
  
    cm->DefineProperty
--- 882,904 ----
       "All Windows-based systems including Cygwin are DLL platforms."
  
+ #define CM_TARGET_OUTDIR_DOC(TYPE, type)                                    \
+      "This property specifies the directory into which " #type " target "   \
+      "files should be built. "                                              \
+      CM_TARGET_FILE_TYPES_DOC "  "                                          \
+      "This property is initialized by the value of the variable "           \
+      "CMAKE_" #TYPE "_OUTPUT_DIRECTORY if it is set when a target is created."
+ 
    cm->DefineProperty
      ("ARCHIVE_OUTPUT_DIRECTORY", cmProperty::TARGET,
       "Output directory in which to build ARCHIVE target files.",
!      CM_TARGET_OUTDIR_DOC(ARCHIVE, archive));
    cm->DefineProperty
      ("LIBRARY_OUTPUT_DIRECTORY", cmProperty::TARGET,
       "Output directory in which to build LIBRARY target files.",
!      CM_TARGET_OUTDIR_DOC(LIBRARY, library));
    cm->DefineProperty
      ("RUNTIME_OUTPUT_DIRECTORY", cmProperty::TARGET,
       "Output directory in which to build RUNTIME target files.",
!      CM_TARGET_OUTDIR_DOC(RUNTIME, runtime));
  
    cm->DefineProperty

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.521.2.2
retrieving revision 1.521.2.3
diff -C 2 -d -r1.521.2.2 -r1.521.2.3
*** cmMakefile.cxx	9 Oct 2009 20:11:14 -0000	1.521.2.2
--- cmMakefile.cxx	3 Nov 2009 22:25:02 -0000	1.521.2.3
***************
*** 3389,3400 ****
      up->Set(var, varDef);
      }
!   else if(cmMakefile* parent =
!           this->LocalGenerator->GetParent()->GetMakefile())
      {
      // Update the definition in the parent directory top scope.  This
      // directory's scope was initialized by the closure of the parent
      // scope, so we do not need to localize the definition first.
      parent->Internal->VarStack.top().Set(var, varDef);
      }
  }
  
--- 3389,3406 ----
      up->Set(var, varDef);
      }
!   else if(cmLocalGenerator* plg = this->LocalGenerator->GetParent())
      {
      // Update the definition in the parent directory top scope.  This
      // directory's scope was initialized by the closure of the parent
      // scope, so we do not need to localize the definition first.
+     cmMakefile* parent = plg->GetMakefile();
      parent->Internal->VarStack.top().Set(var, varDef);
      }
+   else
+     {
+     cmOStringStream m;
+     m << "Cannot set \"" << var << "\": current scope has no parent.";
+     this->IssueMessage(cmake::AUTHOR_WARNING, m.str());
+     }
  }
  



More information about the Cmake-commits mailing list