diff options
author | David Cole <david.cole@kitware.com> | 2011-07-18 19:25:30 (GMT) |
---|---|---|
committer | David Cole <david.cole@kitware.com> | 2011-07-18 20:37:06 (GMT) |
commit | 0c030ef72c30d9c8634d0d815b15d9f238b7b267 (patch) | |
tree | 71cfc05669982beeaff769b42e721a5ff821c7ff /Source/cmTarget.cxx | |
parent | fefaaa09d92b5a2a58f44f433c096db5ec6668ed (diff) | |
download | CMake-0c030ef72c30d9c8634d0d815b15d9f238b7b267.zip CMake-0c030ef72c30d9c8634d0d815b15d9f238b7b267.tar.gz CMake-0c030ef72c30d9c8634d0d815b15d9f238b7b267.tar.bz2 |
Add use of EFFECTIVE_PLATFORM_NAME to generated Xcode projects.
Facilitates building iOS projects, enabling switching back and forth
between simulator and device builds at development time.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r-- | Source/cmTarget.cxx | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 52b9072..2cb3c01 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3688,9 +3688,11 @@ const char* cmTarget::GetOutputTargetType(bool implib) } //---------------------------------------------------------------------------- -void cmTarget::ComputeOutputDir(const char* config, +bool cmTarget::ComputeOutputDir(const char* config, bool implib, std::string& out) { + bool usesDefaultOutputDir = false; + // Look for a target property defining the target output directory // based on the target type. std::string targetTypeName = this->GetOutputTargetType(implib); @@ -3742,6 +3744,7 @@ void cmTarget::ComputeOutputDir(const char* config, if(out.empty()) { // Default to the current output directory. + usesDefaultOutputDir = true; out = "."; } @@ -3757,6 +3760,15 @@ void cmTarget::ComputeOutputDir(const char* config, this->Makefile->GetLocalGenerator()->GetGlobalGenerator()-> AppendDirectoryForConfig("/", config, "", out); } + + return usesDefaultOutputDir; +} + +//---------------------------------------------------------------------------- +bool cmTarget::UsesDefaultOutputDir(const char* config, bool implib) +{ + std::string dir; + return this->ComputeOutputDir(config, implib, dir); } //---------------------------------------------------------------------------- |