From 8a135ea0181e7955aa92f8036428fff6c0b7989d Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 10 Oct 2025 10:38:34 -0400 Subject: [PATCH] Tests: Teach MSVC ABI defs cases to tolerate NVCC CUDA arch warnings --- Tests/RunCMake/MsvcCharsetDefines/RunCMakeTest.cmake | 1 + Tests/RunCMake/SharedLibraryDefines/RunCMakeTest.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/Tests/RunCMake/MsvcCharsetDefines/RunCMakeTest.cmake b/Tests/RunCMake/MsvcCharsetDefines/RunCMakeTest.cmake index ac82a9f346..5eac2bee59 100644 --- a/Tests/RunCMake/MsvcCharsetDefines/RunCMakeTest.cmake +++ b/Tests/RunCMake/MsvcCharsetDefines/RunCMakeTest.cmake @@ -4,6 +4,7 @@ function(configure_and_build case) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build) run_cmake(${case}) set(RunCMake_TEST_NO_CLEAN 1) + set(RunCMake_TEST_OUTPUT_MERGE 1) if (RunCMake_GENERATOR_IS_MULTI_CONFIG) run_cmake_command(${case}-build-Debug ${CMAKE_COMMAND} --build . --config Debug) run_cmake_command(${case}-build-Release ${CMAKE_COMMAND} --build . --config Release) diff --git a/Tests/RunCMake/SharedLibraryDefines/RunCMakeTest.cmake b/Tests/RunCMake/SharedLibraryDefines/RunCMakeTest.cmake index ac82a9f346..5eac2bee59 100644 --- a/Tests/RunCMake/SharedLibraryDefines/RunCMakeTest.cmake +++ b/Tests/RunCMake/SharedLibraryDefines/RunCMakeTest.cmake @@ -4,6 +4,7 @@ function(configure_and_build case) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build) run_cmake(${case}) set(RunCMake_TEST_NO_CLEAN 1) + set(RunCMake_TEST_OUTPUT_MERGE 1) if (RunCMake_GENERATOR_IS_MULTI_CONFIG) run_cmake_command(${case}-build-Debug ${CMAKE_COMMAND} --build . --config Debug) run_cmake_command(${case}-build-Release ${CMAKE_COMMAND} --build . --config Release)