diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-10 18:16:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-10 18:17:28 (GMT) |
| commit | fc94de68972aa8a3d71e50878f5f3223fc422e6c (patch) | |
| tree | aa1ad2689d0b75deea6a77e99f240ad4f387c909 | |
| parent | 18e97c00f4893e4c4c5683e0b81beeff92cf6323 (diff) | |
| parent | 353405daefbe6d6202378214f78cee9219662bb0 (diff) | |
| download | CMake-fc94de68972aa8a3d71e50878f5f3223fc422e6c.zip CMake-fc94de68972aa8a3d71e50878f5f3223fc422e6c.tar.gz CMake-fc94de68972aa8a3d71e50878f5f3223fc422e6c.tar.bz2 | |
Merge topic 'custom-target-FOLDER'
353405daef Add support for FOLDER target property to custom targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4193
| -rw-r--r-- | Source/cmTarget.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index d2693b8..35051c3 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -358,7 +358,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, initProp("CUDA_RESOLVE_DEVICE_SYMBOLS"); initProp("LINK_SEARCH_START_STATIC"); initProp("LINK_SEARCH_END_STATIC"); - initProp("FOLDER"); initProp("Swift_LANGUAGE_VERSION"); initProp("Swift_MODULE_DIRECTORY"); initProp("VS_JUST_MY_CODE_DEBUGGING"); @@ -390,6 +389,8 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, } if (this->GetType() != cmStateEnums::INTERFACE_LIBRARY) { + initProp("FOLDER"); + if (this->GetGlobalGenerator()->IsXcode()) { initProp("XCODE_GENERATE_SCHEME"); } |