diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-21 12:53:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-21 12:53:16 (GMT) |
| commit | 5b241d0ae86569399275e1fc57b403cfb13f7c35 (patch) | |
| tree | 4107ef75fba221998adc65e0abdc92f3d88a9cb1 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 718daeb4e6b93527ea8fa0b87091008737b0a897 (diff) | |
| parent | cf320f7cd74eeb87437f737e6e977f2231e109a1 (diff) | |
| download | CMake-5b241d0ae86569399275e1fc57b403cfb13f7c35.zip CMake-5b241d0ae86569399275e1fc57b403cfb13f7c35.tar.gz CMake-5b241d0ae86569399275e1fc57b403cfb13f7c35.tar.bz2 | |
Merge topic '16760-refactor-get-mac-content-directory'
cf320f7c Replace boolean `implib` parameters with enum
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !662
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 6118c73..4213751 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1817,7 +1817,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, gtgt->GetType() == cmStateEnums::MODULE_LIBRARY || gtgt->GetType() == cmStateEnums::EXECUTABLE) { if (this->XcodeVersion >= 21) { - if (!gtgt->UsesDefaultOutputDir(configName, false)) { + if (!gtgt->UsesDefaultOutputDir(configName, + cmStateEnums::RuntimeBinaryArtifact)) { std::string pncdir = gtgt->GetDirectory(configName); buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR", this->CreateString(pncdir)); |