[Cmake-commits] [cmake-commits] king committed cmCTest.cxx 1.370.2.3 1.370.2.4 cmLocalGenerator.cxx 1.315.2.3 1.315.2.4

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	cmCTest.cxx cmLocalGenerator.cxx 
Log Message:
CMake 2.8.1-rc2


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.315.2.3
retrieving revision 1.315.2.4
diff -C 2 -d -r1.315.2.3 -r1.315.2.4
*** cmLocalGenerator.cxx	28 Jan 2010 21:47:57 -0000	1.315.2.3
--- cmLocalGenerator.cxx	11 Feb 2010 15:50:42 -0000	1.315.2.4
***************
*** 1785,1788 ****
--- 1785,1792 ----
      std::string isysrootVar = std::string("CMAKE_") + lang + "_HAS_ISYSROOT";
      bool hasIsysroot = this->Makefile->IsOn(isysrootVar.c_str());
+     std::string deploymentTargetFlagVar =
+       std::string("CMAKE_") + lang + "_OSX_DEPLOYMENT_TARGET_FLAG";
+     const char* deploymentTargetFlag =
+       this->Makefile->GetDefinition(deploymentTargetFlagVar.c_str());
      bool flagsUsed = false;
      if(!archs.empty() && sysroot && lang && (lang[0] =='C' || lang[0] == 'F'))
***************
*** 1816,1823 ****
        }
  
!     if (deploymentTarget && *deploymentTarget &&
!         lang && (lang[0] =='C' || lang[0] == 'F'))
        {
!       flags += " -mmacosx-version-min=";
        flags += deploymentTarget;
        }
--- 1820,1828 ----
        }
  
!     if (deploymentTargetFlag && *deploymentTargetFlag &&
!         deploymentTarget && *deploymentTarget)
        {
!       flags += " ";
!       flags += deploymentTargetFlag;
        flags += deploymentTarget;
        }

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.370.2.3
retrieving revision 1.370.2.4
diff -C 2 -d -r1.370.2.3 -r1.370.2.4
*** cmCTest.cxx	28 Jan 2010 21:47:49 -0000	1.370.2.3
--- cmCTest.cxx	11 Feb 2010 15:50:42 -0000	1.370.2.4
***************
*** 399,403 ****
    url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php";
    
!   int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response);
    
    return res ? this->GetCTestConfiguration("CDashVersion") : response;
--- 399,403 ----
    url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php";
    
!   int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
    
    return res ? this->GetCTestConfiguration("CDashVersion") : response;
***************
*** 472,475 ****
--- 472,479 ----
      }
  
+   // call this so that the information is cached up front
+   // and not the first time EndTest is called.
+   this->ShouldCompressTestOutput();
+ 
    if ( this->ProduceXML )
      {