diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-09 16:41:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-12-09 16:41:15 (GMT) |
| commit | d806263578278e1b9566e086ccceecaefd324106 (patch) | |
| tree | 8f57c9bedd60f8e6021c66d5d693d7c27bcef94b /Source | |
| parent | 2c7aeaf47bc6a2c9a63d2800a5ea247559a58a7e (diff) | |
| parent | 90d8bd2deb05e64a13a5f8e6863715cb07292ae7 (diff) | |
| download | CMake-d806263578278e1b9566e086ccceecaefd324106.zip CMake-d806263578278e1b9566e086ccceecaefd324106.tar.gz CMake-d806263578278e1b9566e086ccceecaefd324106.tar.bz2 | |
Merge branch 'backport-3.16-toc_on_ppc' into toc_on_ppc
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Modules/CheckCXXLinkerFlag.cmake | 29 | ||||
| -rw-r--r-- | Source/cmCommands.cxx | 4 |
2 files changed, 31 insertions, 2 deletions
diff --git a/Source/Modules/CheckCXXLinkerFlag.cmake b/Source/Modules/CheckCXXLinkerFlag.cmake new file mode 100644 index 0000000..6cb1ba3 --- /dev/null +++ b/Source/Modules/CheckCXXLinkerFlag.cmake @@ -0,0 +1,29 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +include_guard(GLOBAL) +include(CheckCXXSourceCompiles) +include(CMakeCheckCompilerFlagCommonPatterns) + +function(check_cxx_linker_flag _flag _var) + if(CMAKE_VERSION VERSION_LESS "3.14") + set(CMAKE_REQUIRED_LIBRARIES "${_flag}") + else() + set(CMAKE_REQUIRED_LINK_OPTIONS "${_flag}") + endif() + + # Normalize locale during test compilation. + set(_locale_vars LC_ALL LC_MESSAGES LANG) + foreach(v IN LISTS _locale_vars) + set(_locale_vars_saved_${v} "$ENV{${v}}") + set(ENV{${v}} C) + endforeach() + check_compiler_flag_common_patterns(_common_patterns) + check_cxx_source_compiles("int main() { return 0; }" ${_var} + ${_common_patterns} + ) + foreach(v IN LISTS _locale_vars) + set(ENV{${v}} ${_locale_vars_saved_${v}}) + endforeach() + set(${_var} "${${_var}}" PARENT_SCOPE) +endfunction() diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index 563e0f1..896b6a9 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -78,6 +78,7 @@ #include "cmTargetCompileOptionsCommand.h" #include "cmTargetIncludeDirectoriesCommand.h" #include "cmTargetLinkLibrariesCommand.h" +#include "cmTargetLinkOptionsCommand.h" #include "cmTargetPrecompileHeadersCommand.h" #include "cmTargetSourcesCommand.h" #include "cmTryCompileCommand.h" @@ -107,7 +108,6 @@ # include "cmSourceGroupCommand.h" # include "cmSubdirDependsCommand.h" # include "cmTargetLinkDirectoriesCommand.h" -# include "cmTargetLinkOptionsCommand.h" # include "cmUseMangledMesaCommand.h" # include "cmUtilitySourceCommand.h" # include "cmVariableRequiresCommand.h" @@ -257,6 +257,7 @@ void GetProjectCommands(cmState* state) cmTargetIncludeDirectoriesCommand); state->AddBuiltinCommand("target_link_libraries", cmTargetLinkLibrariesCommand); + state->AddBuiltinCommand("target_link_options", cmTargetLinkOptionsCommand); state->AddBuiltinCommand("target_sources", cmTargetSourcesCommand); state->AddBuiltinCommand("try_compile", cm::make_unique<cmTryCompileCommand>()); @@ -277,7 +278,6 @@ void GetProjectCommands(cmState* state) state->AddBuiltinCommand("install_programs", cmInstallProgramsCommand); state->AddBuiltinCommand("add_link_options", cmAddLinkOptionsCommand); state->AddBuiltinCommand("link_libraries", cmLinkLibrariesCommand); - state->AddBuiltinCommand("target_link_options", cmTargetLinkOptionsCommand); state->AddBuiltinCommand("target_link_directories", cmTargetLinkDirectoriesCommand); state->AddBuiltinCommand("qt_wrap_cpp", cmQTWrapCPPCommand); |