diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-13 18:33:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-13 18:33:21 (GMT) |
| commit | 98d5623a7b809a8d730fd197412935b52f234e7d (patch) | |
| tree | 300a44f4b872073895b3d412cece959636af323a /Source/cmTarget.cxx | |
| parent | 21e03c4c4431878c70afeefcf4f0271f5d8b16ed (diff) | |
| parent | 64c9b318bf6062aa1a451d15af9e7016057168c1 (diff) | |
| download | CMake-98d5623a7b809a8d730fd197412935b52f234e7d.zip CMake-98d5623a7b809a8d730fd197412935b52f234e7d.tar.gz CMake-98d5623a7b809a8d730fd197412935b52f234e7d.tar.bz2 | |
Merge topic 'effective-platform-name'
64c9b31 Xcode: Add test to demonstrate iOS project in Xcode
59a2265 Xcode: Use EFFECTIVE_PLATFORM_NAME reference in ComputeOutputDir
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index a7f50f6..fb92016 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3801,8 +3801,12 @@ bool cmTarget::ComputeOutputDir(const char* config, // The generator may add the configuration's subdirectory. if(config && *config) { + const char *platforms = this->Makefile->GetDefinition( + "CMAKE_XCODE_EFFECTIVE_PLATFORMS"); + std::string suffix = + usesDefaultOutputDir && platforms ? "$(EFFECTIVE_PLATFORM_NAME)" : ""; this->Makefile->GetLocalGenerator()->GetGlobalGenerator()-> - AppendDirectoryForConfig("/", config, "", out); + AppendDirectoryForConfig("/", config, suffix.c_str(), out); } return usesDefaultOutputDir; |