diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-02 12:25:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-02 12:25:27 (GMT) |
| commit | b21e4e4a1511417956b1d6d07f49425747c400e2 (patch) | |
| tree | 3f385f63e23090cbe464e897ba303edf3e0130b8 /Source | |
| parent | f695b6b3bb0347ec47e6457d330237920d6e7cf7 (diff) | |
| parent | ac9934406da6793a8c841db6d53f292f65124ed7 (diff) | |
| download | CMake-b21e4e4a1511417956b1d6d07f49425747c400e2.zip CMake-b21e4e4a1511417956b1d6d07f49425747c400e2.tar.gz CMake-b21e4e4a1511417956b1d6d07f49425747c400e2.tar.bz2 | |
Merge branch 'backport-xcode-scheme-custom-target' into release-3.15
Merge-request: !3878
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTarget.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index a67122c..98c66da 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -334,7 +334,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, InitProperty("VS_JUST_MY_CODE_DEBUGGING", nullptr); #ifdef __APPLE__ if (this->GetGlobalGenerator()->IsXcode()) { - InitProperty("XCODE_GENERATE_SCHEME", nullptr); InitProperty("XCODE_SCHEME_ADDRESS_SANITIZER", nullptr); InitProperty("XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN", nullptr); InitProperty("XCODE_SCHEME_THREAD_SANITIZER", nullptr); @@ -354,6 +353,12 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, #endif } + if (this->GetType() != cmStateEnums::INTERFACE_LIBRARY) { + if (this->GetGlobalGenerator()->IsXcode()) { + InitProperty("XCODE_GENERATE_SCHEME", nullptr); + } + } + // Setup per-configuration property default values. if (this->GetType() != cmStateEnums::UTILITY) { static const auto configProps = { |