summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-09-18 19:16:33 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-09-18 19:16:33 (GMT)
commite7d75864d1cb558846e2f6cdd6c560e9772d2e45 (patch)
tree5eebd566163b58174aaae3739c28cb3d9f07900e
parent7b0e7f714b06885742b19dea0121a7480e2a7e57 (diff)
downloadCMake-e7d75864d1cb558846e2f6cdd6c560e9772d2e45.zip
CMake-e7d75864d1cb558846e2f6cdd6c560e9772d2e45.tar.gz
CMake-e7d75864d1cb558846e2f6cdd6c560e9772d2e45.tar.bz2
Only do the OSX arch stuff on OSX.
-rw-r--r--Source/cmLocalGenerator.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e685b5a..800bb48 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1748,7 +1748,8 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
std::string flagsVar = "CMAKE_";
flagsVar += lang;
flagsVar += "_FLAGS";
-
+ // Add special OSX flags
+#ifdef __APPLE__
if(this->EmitUniversalBinaryFlags)
{
const char* osxArch =
@@ -1815,7 +1816,7 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
flags += deploymentTarget;
}
}
-
+#endif
this->AddConfigVariableFlags(flags, flagsVar.c_str(), config);
}