diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-10-26 12:13:58 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-10-28 19:06:02 (GMT) |
| commit | a524bf3aa712a783e24e9307cf8915310fb8613a (patch) | |
| tree | 15b83ce8d536478f37c5156294f17d7a04fff27e /Modules | |
| parent | 96ea613f169cedc4087b536d95ca6c128b8f4eb6 (diff) | |
| download | CMake-a524bf3aa712a783e24e9307cf8915310fb8613a.zip CMake-a524bf3aa712a783e24e9307cf8915310fb8613a.tar.gz CMake-a524bf3aa712a783e24e9307cf8915310fb8613a.tar.bz2 | |
CheckSourceRuns: do not fail on unrecognized arguments
The old `check_X_source_runs` modules did not verify the arguments, so
we cannot start doing it now. Downgrade the hard error introduced in
commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a
source runs, 2020-09-14) via !5223 into a noisy warning.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CheckCSourceRuns.cmake | 2 | ||||
| -rw-r--r-- | Modules/CheckCXXSourceRuns.cmake | 2 | ||||
| -rw-r--r-- | Modules/CheckOBJCSourceRuns.cmake | 2 | ||||
| -rw-r--r-- | Modules/CheckOBJCXXSourceRuns.cmake | 2 | ||||
| -rw-r--r-- | Modules/Internal/CheckSourceRuns.cmake | 7 |
5 files changed, 14 insertions, 1 deletions
diff --git a/Modules/CheckCSourceRuns.cmake b/Modules/CheckCSourceRuns.cmake index 258b1a0..a99e47e 100644 --- a/Modules/CheckCSourceRuns.cmake +++ b/Modules/CheckCSourceRuns.cmake @@ -68,5 +68,7 @@ include_guard(GLOBAL) include(Internal/CheckSourceRuns) macro(CHECK_C_SOURCE_RUNS SOURCE VAR) + set(_CheckSourceRuns_old_signature 1) cmake_check_source_runs(C "${SOURCE}" ${VAR} ${ARGN}) + unset(_CheckSourceRuns_old_signature) endmacro() diff --git a/Modules/CheckCXXSourceRuns.cmake b/Modules/CheckCXXSourceRuns.cmake index 246c873..c8ff3d7 100644 --- a/Modules/CheckCXXSourceRuns.cmake +++ b/Modules/CheckCXXSourceRuns.cmake @@ -68,5 +68,7 @@ include_guard(GLOBAL) include(Internal/CheckSourceRuns) macro(CHECK_CXX_SOURCE_RUNS SOURCE VAR) + set(_CheckSourceRuns_old_signature 1) cmake_check_source_runs(CXX "${SOURCE}" ${VAR} ${ARGN}) + unset(_CheckSourceRuns_old_signature) endmacro() diff --git a/Modules/CheckOBJCSourceRuns.cmake b/Modules/CheckOBJCSourceRuns.cmake index 9894180..dd03309 100644 --- a/Modules/CheckOBJCSourceRuns.cmake +++ b/Modules/CheckOBJCSourceRuns.cmake @@ -70,5 +70,7 @@ include_guard(GLOBAL) include(Internal/CheckSourceRuns) macro(CHECK_OBJC_SOURCE_RUNS SOURCE VAR) + set(_CheckSourceRuns_old_signature 1) cmake_check_source_runs(OBJC "${SOURCE}" ${VAR} ${ARGN}) + unset(_CheckSourceRuns_old_signature) endmacro() diff --git a/Modules/CheckOBJCXXSourceRuns.cmake b/Modules/CheckOBJCXXSourceRuns.cmake index 43d514f..05a5e4c 100644 --- a/Modules/CheckOBJCXXSourceRuns.cmake +++ b/Modules/CheckOBJCXXSourceRuns.cmake @@ -70,5 +70,7 @@ include_guard(GLOBAL) include(Internal/CheckSourceRuns) macro(CHECK_OBJCXX_SOURCE_RUNS SOURCE VAR) + set(_CheckSourceRuns_old_signature 1) cmake_check_source_runs(OBJCXX "${SOURCE}" ${VAR} ${ARGN}) + unset(_CheckSourceRuns_old_signature) endmacro() diff --git a/Modules/Internal/CheckSourceRuns.cmake b/Modules/Internal/CheckSourceRuns.cmake index c667245..3a4b758 100644 --- a/Modules/Internal/CheckSourceRuns.cmake +++ b/Modules/Internal/CheckSourceRuns.cmake @@ -51,7 +51,12 @@ function(CMAKE_CHECK_SOURCE_RUNS _lang _source _var) set(_SRC_EXT "${arg}") set(_key "") else() - message(FATAL_ERROR "Unknown argument:\n ${arg}\n") + set(message_type FATAL_ERROR) + if (_CheckSourceRuns_old_signature) + set(message_type AUTHOR_WARNING) + endif () + message("${message_type}" "Unknown argument:\n ${arg}\n") + unset(message_type) endif() endforeach() |