瀏覽代碼

Refactor GetCompileDefinitions a bit.

It is now easier to add generator expressions.
Stephen Kelly 13 年之前
父節點
當前提交
b8e61d687a
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. 6 6
      Source/cmGeneratorTarget.cxx

+ 6 - 6
Source/cmGeneratorTarget.cxx

@@ -316,13 +316,13 @@ std::vector<std::string> cmGeneratorTarget::GetIncludeDirectories()
 //----------------------------------------------------------------------------
 std::string cmGeneratorTarget::GetCompileDefinitions(const char *config)
 {
-  if (!config)
+  std::string defPropName = "COMPILE_DEFINITIONS";
+  if (config)
     {
-    return this->Target->GetProperty("COMPILE_DEFINITIONS");
+    defPropName += "_" + cmSystemTools::UpperCase(config);
     }
-  std::string defPropName = "COMPILE_DEFINITIONS_";
-  defPropName +=
-    cmSystemTools::UpperCase(config);
 
-  return this->Target->GetProperty(defPropName.c_str());
+  const char *prop = this->Target->GetProperty(defPropName.c_str());
+
+  return prop ? prop : "";
 }