diff options
| author | Brad King <brad.king@kitware.com> | 2010-02-11 15:50:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-02-11 15:50:43 (GMT) |
| commit | 224dde9085aa05b23b3ee86d33ffff9c1625a510 (patch) | |
| tree | be96b7a4f4d96108fbb157964a8f83545616363c /Source/cmLocalGenerator.cxx | |
| parent | b6e42e3aa48610c04612925db87dca0fbc5667eb (diff) | |
| download | CMake-224dde9085aa05b23b3ee86d33ffff9c1625a510.zip CMake-224dde9085aa05b23b3ee86d33ffff9c1625a510.tar.gz CMake-224dde9085aa05b23b3ee86d33ffff9c1625a510.tar.bz2 | |
CMake 2.8.1-rc2
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 3339ee4..851e34f 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1784,6 +1784,10 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags, this->Makefile->GetDefinition("CMAKE_OSX_DEPLOYMENT_TARGET"); 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')) { @@ -1815,10 +1819,11 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags, flags += sysroot; } - if (deploymentTarget && *deploymentTarget && - lang && (lang[0] =='C' || lang[0] == 'F')) + if (deploymentTargetFlag && *deploymentTargetFlag && + deploymentTarget && *deploymentTarget) { - flags += " -mmacosx-version-min="; + flags += " "; + flags += deploymentTargetFlag; flags += deploymentTarget; } } |