ソースを参照

cmLocalGenerator: Avoid unnecessary lookup without a deployment target

Brad King 1 年間 前
コミット
3ece4553c2
1 ファイル変更10 行追加8 行削除
  1. 10 8
      Source/cmLocalGenerator.cxx

+ 10 - 8
Source/cmLocalGenerator.cxx

@@ -1978,14 +1978,16 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
 
     cmValue deploymentTarget =
       this->Makefile->GetDefinition("CMAKE_OSX_DEPLOYMENT_TARGET");
-    std::string deploymentTargetFlagVar =
-      "CMAKE_" + lang + "_OSX_DEPLOYMENT_TARGET_FLAG";
-    cmValue deploymentTargetFlag =
-      this->Makefile->GetDefinition(deploymentTargetFlagVar);
-    if (cmNonempty(deploymentTargetFlag) && cmNonempty(deploymentTarget)) {
-      flags += " ";
-      flags += *deploymentTargetFlag;
-      flags += *deploymentTarget;
+    if (cmNonempty(deploymentTarget)) {
+      std::string deploymentTargetFlagVar =
+        "CMAKE_" + lang + "_OSX_DEPLOYMENT_TARGET_FLAG";
+      cmValue deploymentTargetFlag =
+        this->Makefile->GetDefinition(deploymentTargetFlagVar);
+      if (cmNonempty(deploymentTargetFlag)) {
+        flags += " ";
+        flags += *deploymentTargetFlag;
+        flags += *deploymentTarget;
+      }
     }
   }
 }