diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-01 13:53:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-01 13:53:30 (GMT) |
| commit | dd2b88777fa549bf261a84a0914a5a8171ae0a56 (patch) | |
| tree | c53d82b24bfe5b4fd732a7ffaf4e76260cf028d1 /Source | |
| parent | 0e08ab6ef165791e582fce9aecc2a288075a7da4 (diff) | |
| parent | ad262917d96aa4d6faeff3c9dfecf684cebbe123 (diff) | |
| download | CMake-dd2b88777fa549bf261a84a0914a5a8171ae0a56.zip CMake-dd2b88777fa549bf261a84a0914a5a8171ae0a56.tar.gz CMake-dd2b88777fa549bf261a84a0914a5a8171ae0a56.tar.bz2 | |
Merge topic 'fix-ios-install'
ad262917 Xcode: Add unit test for iOS project install (#12506)
48fe617e Fix installation of iOS targets (#12506)
d2c2319d Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to PlatformIsAppleIos
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 12 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 5 |
2 files changed, 13 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index ec36d2a..49f3b29 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2422,7 +2422,17 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets) if ( cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.' ) { std::string cfgArg = "-DBUILD_TYPE="; - cfgArg += mf->GetDefinition("CMAKE_CFG_INTDIR"); + bool iosPlatform = mf->PlatformIsAppleIos(); + if(iosPlatform) + { + cfgArg += "$(CONFIGURATION)"; + singleLine.push_back(cfgArg); + cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)"; + } + else + { + cfgArg += mf->GetDefinition("CMAKE_CFG_INTDIR"); + } singleLine.push_back(cfgArg); } singleLine.push_back("-P"); diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 4affc8d..590654d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2901,10 +2901,9 @@ bool cmTarget::ComputeOutputDir(const std::string& config, // The generator may add the configuration's subdirectory. if(!conf.empty()) { - const char *platforms = this->Makefile->GetDefinition( - "CMAKE_XCODE_EFFECTIVE_PLATFORMS"); + bool iosPlatform = this->Makefile->PlatformIsAppleIos(); std::string suffix = - usesDefaultOutputDir && platforms ? "$(EFFECTIVE_PLATFORM_NAME)" : ""; + usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : ""; this->Makefile->GetGlobalGenerator()-> AppendDirectoryForConfig("/", conf, suffix, out); } |