mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-08 08:09:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'xcode-scheme-custom-target'

Browse Source 
333a2ff099 Merge branch 'backport-xcode-scheme-custom-target'
7cccc5b199 Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets
ac9934406d Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3878
This commit is contained in:
Brad King
2019-10-03 13:08:56 +00:00
committed by Kitware Robot
parent 53dedbd51e 333a2ff099
commit 96bc0a5d99
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmTarget.cxx
View File

@@ -364,7 +364,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
initPropValue("UNITY_BUILD_BATCH_SIZE", "8");
#ifdef __APPLE__
if (this->GetGlobalGenerator()->IsXcode()) {
initProp("XCODE_GENERATE_SCHEME");
initProp("XCODE_SCHEME_ADDRESS_SANITIZER");
initProp("XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN");
initProp("XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING");
@@ -385,6 +384,12 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
#endif
}
if (this->GetType() != cmStateEnums::INTERFACE_LIBRARY) {
if (this->GetGlobalGenerator()->IsXcode()) {
initProp("XCODE_GENERATE_SCHEME");
}
}
// Setup per-configuration property default values.
if (this->GetType() != cmStateEnums::UTILITY) {
static const auto configProps = {