[Cmake-commits] [cmake-commits] hoffman committed cmDocumentVariables.cxx 1.18.2.4 1.18.2.5 cmExtraEclipseCDT4Generator.cxx 1.13.2.3 1.13.2.4 cmFunctionCommand.cxx 1.6 1.6.2.1 cmMakefile.cxx 1.463.2.10 1.463.2.11 cmMakefile.h 1.230.2.6 1.230.2.7

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmDocumentVariables.cxx cmExtraEclipseCDT4Generator.cxx 
	cmFunctionCommand.cxx cmMakefile.cxx cmMakefile.h 
Log Message:
ENH: merge in changes from main tree, fix borland build


Index: cmDocumentVariables.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDocumentVariables.cxx,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.5
diff -C 2 -d -r1.18.2.4 -r1.18.2.5
*** cmDocumentVariables.cxx	13 Jan 2009 18:03:51 -0000	1.18.2.4
--- cmDocumentVariables.cxx	15 Jan 2009 14:17:20 -0000	1.18.2.5
***************
*** 209,212 ****
--- 209,226 ----
       " executable being run.",false,
       "Variables that Provide Information");
+   cm->DefineProperty
+     ("CMAKE_PATCH_VERSION", cmProperty::VARIABLE,
+      "The patch version of cmake (i.e. the 3 in X.X.3).",
+      "This specifies the patch version of the CMake"
+      " executable being run.",false,
+      "Variables that Provide Information");
+   cm->DefineProperty
+     ("CMAKE_VERSION", cmProperty::VARIABLE,
+      "The full version of cmake in major.minor.patch format.",
+      "This specifies the full version of the CMake executable being run.  "
+      "This variable is defined by versions 2.6.3 and higher.  "
+      "See variables CMAKE_MAJOR_VERSION, CMAKE_MINOR_VERSION, and "
+      "CMAKE_PATCH_VERSION for individual version components.", false,
+      "Variables that Provide Information");
  
    cm->DefineProperty

Index: cmFunctionCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFunctionCommand.cxx,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C 2 -d -r1.6 -r1.6.2.1
*** cmFunctionCommand.cxx	7 Mar 2008 13:40:36 -0000	1.6
--- cmFunctionCommand.cxx	15 Jan 2009 14:17:20 -0000	1.6.2.1
***************
*** 105,109 ****
  
    // we push a scope on the makefile
!   this->Makefile->PushScope();
  
    // set the value of argc
--- 105,110 ----
  
    // we push a scope on the makefile
!   cmMakefile::ScopePushPop varScope(this->Makefile);
!   static_cast<void>(varScope);
  
    // set the value of argc
***************
*** 168,172 ****
      if (status.GetReturnInvoked())
        {
-       this->Makefile->PopScope();
        return true;
        }
--- 169,172 ----
***************
*** 174,178 ****
  
    // pop scope on the makefile
-   this->Makefile->PopScope();
    return true;
  }
--- 174,177 ----

Index: cmExtraEclipseCDT4Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraEclipseCDT4Generator.cxx,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C 2 -d -r1.13.2.3 -r1.13.2.4
*** cmExtraEclipseCDT4Generator.cxx	13 Jan 2009 18:03:52 -0000	1.13.2.3
--- cmExtraEclipseCDT4Generator.cxx	15 Jan 2009 14:17:20 -0000	1.13.2.4
***************
*** 649,654 ****
            {
            bool insertTarget = true;
!           if(insertTarget && (this->TargetsToIgnore.find(t->first) != 
!                                                   this->TargetsToIgnore.end()))
              {
              insertTarget = false;
--- 649,656 ----
            {
            bool insertTarget = true;
!           if(insertTarget &&
!              (std::set<std::string>::const_iterator(
!                this->TargetsToIgnore.find(t->first)) !=
!               this->TargetsToIgnore.end()))
              {
              insertTarget = false;

Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.230.2.6
retrieving revision 1.230.2.7
diff -C 2 -d -r1.230.2.6 -r1.230.2.7
*** cmMakefile.h	2 Dec 2008 12:07:40 -0000	1.230.2.6
--- cmMakefile.h	15 Jan 2009 14:17:20 -0000	1.230.2.7
***************
*** 782,785 ****
--- 782,795 ----
    void RaiseScope(const char *var, const char *value);
  
+   /** Helper class to push and pop scopes automatically.  */
+   class ScopePushPop
+   {
+   public:
+     ScopePushPop(cmMakefile* m): Makefile(m) { this->Makefile->PushScope(); }
+     ~ScopePushPop() { this->Makefile->PopScope(); }
+   private:
+     cmMakefile* Makefile;
+   };
+ 
    void IssueMessage(cmake::MessageType t,
                      std::string const& text) const;

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.463.2.10
retrieving revision 1.463.2.11
diff -C 2 -d -r1.463.2.10 -r1.463.2.11
*** cmMakefile.cxx	2 Dec 2008 12:07:39 -0000	1.463.2.10
--- cmMakefile.cxx	15 Jan 2009 14:17:20 -0000	1.463.2.11
***************
*** 2307,2310 ****
--- 2307,2315 ----
    sprintf(temp, "%d", cmVersion::GetPatchVersion());
    this->AddDefinition("CMAKE_PATCH_VERSION", temp);
+   sprintf(temp, "%u.%u.%u",
+           cmVersion::GetMajorVersion(),
+           cmVersion::GetMinorVersion(),
+           cmVersion::GetPatchVersion());
+   this->AddDefinition("CMAKE_VERSION", temp);
  
    this->AddDefinition("CMAKE_FILES_DIRECTORY",