summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-06-01 13:45:49 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-06-01 13:45:56 (GMT)
commitaa3675d28186124a3175b89ed9bfd426c5d6b530 (patch)
tree2975e1935eb275338e0c475e5ff3ee6bfb1bfba2 /Tests
parent859de07aa38af805b74801e0f124e06233263e78 (diff)
parentda27ff1e963b11dd91060fddb9e47a3135b4ac6c (diff)
downloadCMake-aa3675d28186124a3175b89ed9bfd426c5d6b530.zip
CMake-aa3675d28186124a3175b89ed9bfd426c5d6b530.tar.gz
CMake-aa3675d28186124a3175b89ed9bfd426c5d6b530.tar.bz2
Merge topic 'cmake-compile-no-warning-as-error'
da27ff1e96 Preserve --compile-no-warning-as-error in automatic CMake re-runs e0b48284a1 Xcode: Internally uses -S instead of -H to specify source directory Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8522
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/CompileWarningAsError/RunCMakeTest.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/RunCMake/CompileWarningAsError/RunCMakeTest.cmake b/Tests/RunCMake/CompileWarningAsError/RunCMakeTest.cmake
index 392c921..18df14c 100644
--- a/Tests/RunCMake/CompileWarningAsError/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileWarningAsError/RunCMakeTest.cmake
@@ -5,6 +5,10 @@ function(run_compile_warn test lang extension)
set(RunCMake_TEST_OUTPUT_MERGE 1)
run_cmake_with_options(${test}_${lang} "-DLANGUAGE=${lang}" "-DEXTENSION=${extension}" ${ARGN})
set(RunCMake_TEST_NO_CLEAN 1)
+ if(ARGN MATCHES "--compile-no-warning-as-error")
+ # Cause the build system to re-run CMake to verify that this option is preserved.
+ run_cmake_command(${test}_${lang}-Touch ${CMAKE_COMMAND} -E touch_nocreate CMakeCache.txt)
+ endif()
run_cmake_command(${test}_${lang}-Build ${CMAKE_COMMAND} --build . ${verbose_args})
endfunction()