Browse Source

cmGeneratorTarget: Call GetFrameworkDirectory in GetFullNameInternal

Gregor Jasny 8 years ago
parent
commit
013ffe76e7
1 changed files with 1 additions and 7 deletions
  1. 1 7
      Source/cmGeneratorTarget.cxx

+ 1 - 7
Source/cmGeneratorTarget.cxx

@@ -3222,13 +3222,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config,
   // frameworks have directory prefix but no suffix
   std::string fw_prefix;
   if (this->IsFrameworkOnApple()) {
-    fw_prefix = this->GetOutputName(config, false);
-    fw_prefix += ".";
-    const char* ext = this->GetProperty("BUNDLE_EXTENSION");
-    if (!ext) {
-      ext = "framework";
-    }
-    fw_prefix += ext;
+    fw_prefix = this->GetFrameworkDirectory(config, ContentLevel);
     fw_prefix += "/";
     targetPrefix = fw_prefix.c_str();
     targetSuffix = CM_NULLPTR;