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
This commit is contained in:
Brad King
2020-01-10 18:16:44 +00:00
committed by Kitware Robot

View File

@@ -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");
}