diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-09 21:59:10 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-19 18:27:41 (GMT) |
| commit | d8f8940bc68f09e382320d1ffe36947ba880ae65 (patch) | |
| tree | 508c10de687d7a9e244e1253b122a9e71562c548 /Source/cmGeneratorTarget.cxx | |
| parent | 7550879f570502f31aeafbd48f04bafd17234696 (diff) | |
| download | CMake-d8f8940bc68f09e382320d1ffe36947ba880ae65.zip CMake-d8f8940bc68f09e382320d1ffe36947ba880ae65.tar.gz CMake-d8f8940bc68f09e382320d1ffe36947ba880ae65.tar.bz2 | |
cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 7e457bb..b2959fe 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1574,7 +1574,7 @@ bool cmGeneratorTarget::IsBundleOnApple() const { return this->IsFrameworkOnApple() || this->IsAppBundleOnApple() - || this->Target->IsCFBundleOnApple(); + || this->IsCFBundleOnApple(); } //---------------------------------------------------------------------------- @@ -1943,7 +1943,7 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base, { fpath += this->GetFrameworkDirectory(config, contentOnly); } - if(this->Target->IsCFBundleOnApple()) + if(this->IsCFBundleOnApple()) { fpath += this->GetCFBundleDirectory(config, contentOnly); } @@ -3483,7 +3483,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config, targetSuffix = 0; } - if(this->Target->IsCFBundleOnApple()) + if(this->IsCFBundleOnApple()) { fw_prefix = this->GetCFBundleDirectory(config, false); fw_prefix += "/"; @@ -5966,6 +5966,14 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const //---------------------------------------------------------------------------- bool cmGeneratorTarget::IsXCTestOnApple() const { - return (this->Target->IsCFBundleOnApple() && + return (this->IsCFBundleOnApple() && this->GetPropertyAsBool("XCTEST")); } + +//---------------------------------------------------------------------------- +bool cmGeneratorTarget::IsCFBundleOnApple() const +{ + return (this->GetType() == cmState::MODULE_LIBRARY && + this->Makefile->IsOn("APPLE") && + this->GetPropertyAsBool("BUNDLE")); +} |