mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-07 06:40:16 -05:00
cmTarget: De-duplicate conditions for property initialization
This commit is contained in:
+9
-17
@@ -343,10 +343,12 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
|
||||
initProp("C_STANDARD");
|
||||
initProp("C_STANDARD_REQUIRED");
|
||||
initProp("C_EXTENSIONS");
|
||||
initProp("C_VISIBILITY_PRESET");
|
||||
initProp("OBJC_COMPILER_LAUNCHER");
|
||||
initProp("OBJC_STANDARD");
|
||||
initProp("OBJC_STANDARD_REQUIRED");
|
||||
initProp("OBJC_EXTENSIONS");
|
||||
initProp("OBJC_VISIBILITY_PRESET");
|
||||
initProp("CXX_CLANG_TIDY");
|
||||
initProp("CXX_COMPILER_LAUNCHER");
|
||||
initProp("CXX_CPPLINT");
|
||||
@@ -355,10 +357,12 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
|
||||
initProp("CXX_STANDARD");
|
||||
initProp("CXX_STANDARD_REQUIRED");
|
||||
initProp("CXX_EXTENSIONS");
|
||||
initProp("CXX_VISIBILITY_PRESET");
|
||||
initProp("OBJCXX_COMPILER_LAUNCHER");
|
||||
initProp("OBJCXX_STANDARD");
|
||||
initProp("OBJCXX_STANDARD_REQUIRED");
|
||||
initProp("OBJCXX_EXTENSIONS");
|
||||
initProp("OBJCXX_VISIBILITY_PRESET");
|
||||
initProp("CUDA_STANDARD");
|
||||
initProp("CUDA_STANDARD_REQUIRED");
|
||||
initProp("CUDA_EXTENSIONS");
|
||||
@@ -367,6 +371,11 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
|
||||
initProp("CUDA_RESOLVE_DEVICE_SYMBOLS");
|
||||
initProp("CUDA_RUNTIME_LIBRARY");
|
||||
initProp("CUDA_ARCHITECTURES");
|
||||
initProp("CUDA_VISIBILITY_PRESET");
|
||||
initProp("VISIBILITY_INLINES_HIDDEN");
|
||||
initProp("JOB_POOL_COMPILE");
|
||||
initProp("JOB_POOL_LINK");
|
||||
initProp("JOB_POOL_PRECOMPILE_HEADER");
|
||||
initProp("LINK_SEARCH_START_STATIC");
|
||||
initProp("LINK_SEARCH_END_STATIC");
|
||||
initProp("Swift_LANGUAGE_VERSION");
|
||||
@@ -487,16 +496,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
|
||||
impl->Makefile->GetLinkDirectoriesBacktraces());
|
||||
}
|
||||
|
||||
if (this->GetType() != cmStateEnums::INTERFACE_LIBRARY &&
|
||||
this->GetType() != cmStateEnums::UTILITY) {
|
||||
initProp("C_VISIBILITY_PRESET");
|
||||
initProp("CXX_VISIBILITY_PRESET");
|
||||
initProp("OBJC_VISIBILITY_PRESET");
|
||||
initProp("OBJCXX_VISIBILITY_PRESET");
|
||||
initProp("CUDA_VISIBILITY_PRESET");
|
||||
initProp("VISIBILITY_INLINES_HIDDEN");
|
||||
}
|
||||
|
||||
if (impl->TargetType == cmStateEnums::EXECUTABLE) {
|
||||
initProp("ANDROID_GUI");
|
||||
initProp("CROSSCOMPILING_EMULATOR");
|
||||
@@ -528,13 +527,6 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type,
|
||||
impl->PolicyMap.Set(cmPolicies::CMP0022, cmPolicies::NEW);
|
||||
}
|
||||
|
||||
if (this->GetType() != cmStateEnums::INTERFACE_LIBRARY &&
|
||||
this->GetType() != cmStateEnums::UTILITY) {
|
||||
initProp("JOB_POOL_COMPILE");
|
||||
initProp("JOB_POOL_LINK");
|
||||
initProp("JOB_POOL_PRECOMPILE_HEADER");
|
||||
}
|
||||
|
||||
if (impl->TargetType <= cmStateEnums::GLOBAL_TARGET) {
|
||||
initProp("DOTNET_TARGET_FRAMEWORK");
|
||||
initProp("DOTNET_TARGET_FRAMEWORK_VERSION");
|
||||
|
||||
Reference in New Issue
Block a user