[Cmake-commits] [cmake-commits] david.cole committed cmLocalGenerator.cxx 1.322 1.323

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
Fix issue #10155 - default value of CMAKE_OSX_DEPLOYMENT_TARGET should always be the empty string. When the value of CMAKE_OSX_DEPLOYMENT_TARGET is the empty string, the -mmacosx-version-min flag should not show up on the compiler command line. The logic for selecting default value of CMAKE_OSX_SYSROOT is orthogonal to and independent of the value of the deployment target. The default value for CMAKE_OSX_SYSROOT is the SDK that corresponds to the current version of Mac OSX on which cmake is running.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.322
retrieving revision 1.323
diff -C 2 -d -r1.322 -r1.323
*** cmLocalGenerator.cxx	30 Nov 2009 16:16:24 -0000	1.322
--- cmLocalGenerator.cxx	29 Jan 2010 16:56:35 -0000	1.323
***************
*** 1785,1788 ****
--- 1785,1791 ----
      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;
        }
--- 1819,1827 ----
        }
  
!     if (deploymentTargetFlag && *deploymentTargetFlag &&
!         deploymentTarget && *deploymentTarget)
        {
!       flags += " ";
!       flags += deploymentTargetFlag;
        flags += deploymentTarget;
        }