diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-19 13:26:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-19 13:26:57 (GMT) |
| commit | ccd5822a8322155a491ad871fa135cfce1ef9a88 (patch) | |
| tree | 60c1a65be27fabf3d7d17bc39c1595a367f9be8d /Source/cmTarget.cxx | |
| parent | 1ac8523c3bd4f404d8306b3d5fe905e1d988461c (diff) | |
| parent | b189c5994d94b8dd0afdf14844db4a4be28cf4b1 (diff) | |
| download | CMake-ccd5822a8322155a491ad871fa135cfce1ef9a88.zip CMake-ccd5822a8322155a491ad871fa135cfce1ef9a88.tar.gz CMake-ccd5822a8322155a491ad871fa135cfce1ef9a88.tar.bz2 | |
Merge topic 'osx-cfbundle-tweaks'
b189c599 Tests: Run CFBundleTest only with valid configuration
3a605693 Xcode: Call IsCFBundleOnApple to decide if bundle is being built
207b7af0 cmTarget: Use GetCFBundleDirectory within GetFullNameInternal
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 865a824..94a6de3 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -4057,15 +4057,8 @@ void cmTarget::GetFullNameInternal(const std::string& config, if(this->IsCFBundleOnApple()) { - fw_prefix = this->GetOutputName(config, false); - fw_prefix += "."; - const char *ext = this->GetProperty("BUNDLE_EXTENSION"); - if (!ext) - { - ext = "bundle"; - } - fw_prefix += ext; - fw_prefix += "/Contents/MacOS/"; + fw_prefix = this->GetCFBundleDirectory(config, false); + fw_prefix += "/"; targetPrefix = fw_prefix.c_str(); targetSuffix = 0; } |