diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-30 17:34:30 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-30 12:37:14 -0500 |
| commit | 5ef23640535dfd6543bd81c86282e38122169af6 (patch) | |
| tree | 16897a493624c9f7a3a66fd55b6d0197b45e2568 /Modules/Internal | |
| parent | 36c304d17b44498b21b16aad92f5a4818a6f7c41 (diff) | |
| parent | 72f6b4bfbe84a369fbdf4c9671470ba8c3ce14cc (diff) | |
| download | cmake-5ef23640535dfd6543bd81c86282e38122169af6.tar.gz | |
Merge topic 'correct_check_compiler_flag_regression' into release-3.19
72f6b4bfbe Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}Flag
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kumar Gala <kumar.gala@gmail.com>
Merge-request: !5540
Diffstat (limited to 'Modules/Internal')
| -rw-r--r-- | Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake (renamed from Modules/Internal/CMakeCheckCompilerFlag.cmake) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/Internal/CMakeCheckCompilerFlag.cmake b/Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake index 9c8dfb6171..d6fa5f0a67 100644 --- a/Modules/Internal/CMakeCheckCompilerFlag.cmake +++ b/Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake @@ -6,13 +6,13 @@ NOTE: This function is used internally by CMake. Projects should not include this file directly. -The cmake_check_compiler_flag() function can be used to compile and link a +The cmake_try_compiler_or_linker_flag() function can be used to compile and link a source file to check whether a specific compiler or linker flag is supported. The function does not use the try_compile() command so as to avoid infinite recursion. It may not work for all platforms or toolchains, the caller is responsible for ensuring it is only called in valid situations. - cmake_check_compiler_flag(<lang> <flag> <result> + cmake_try_compiler_or_linker_flag(<lang> <flag> <result> [SRC_EXT <ext>] [COMMAND_PATTERN <pattern>] [FAIL_REGEX <regex> ...] [OUTPUT_VARIABLE <output>]) @@ -39,7 +39,7 @@ Optional parameters: include_guard(GLOBAL) include(CMakeCheckCompilerFlagCommonPatterns) -function(CMAKE_CHECK_COMPILER_FLAG lang flag result) +function(CMAKE_TRY_COMPILER_OR_LINKER_FLAG lang flag result) # Cache results between runs similar to check_<lang>_source_compiles() if(DEFINED ${result}) return() |