diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2017-03-28 07:49:40 (GMT) |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2017-03-30 20:24:54 (GMT) |
| commit | 013ffe76e7d67fdb05fe29c82421b0a000feb468 (patch) | |
| tree | f8d05eacf193a252c6afb17469373ba3835febe8 | |
| parent | 32e9d0ca233439c0381abc5acee8a5acd30be494 (diff) | |
| download | CMake-013ffe76e7d67fdb05fe29c82421b0a000feb468.zip CMake-013ffe76e7d67fdb05fe29c82421b0a000feb468.tar.gz CMake-013ffe76e7d67fdb05fe29c82421b0a000feb468.tar.bz2 | |
cmGeneratorTarget: Call GetFrameworkDirectory in GetFullNameInternal
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 95f447f..2938fde 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/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; |