From d62c213cce987b63fc5daa1bf139adc0eaa58b9c Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Mon, 21 Jun 2021 07:57:13 +0000 Subject: [PATCH] Continue fixing warnings with clang as host compiler --- src/gromacs/CMakeLists.txt | 5 ----- src/testutils/TestMacros.cmake | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/gromacs/CMakeLists.txt b/src/gromacs/CMakeLists.txt index ada2664563..464620dbe5 100644 --- a/src/gromacs/CMakeLists.txt +++ b/src/gromacs/CMakeLists.txt @@ -279,11 +279,6 @@ endif() # Do any special handling needed for .cpp files that use # CUDA runtime headers if (GMX_GPU_CUDA AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # CUDA header cuda_runtime_api.h in at least CUDA 10.1 uses 0 - # where nullptr would be preferable. GROMACS can't fix these, so - # must suppress them. - GMX_TEST_CXXFLAG(CXXFLAGS_NO_ZERO_AS_NULL_POINTER_CONSTANT "-Wno-zero-as-null-pointer-constant" NVCC_CLANG_SUPPRESSIONS_CXXFLAGS) - foreach(_compile_flag ${NVCC_CLANG_SUPPRESSIONS_CXXFLAGS}) set(GMX_CUDA_CLANG_FLAGS "${GMX_CUDA_CLANG_FLAGS} ${_compile_flag}") endforeach() diff --git a/src/testutils/TestMacros.cmake b/src/testutils/TestMacros.cmake index c6da3bfb5f..fd400aa4c0 100644 --- a/src/testutils/TestMacros.cmake +++ b/src/testutils/TestMacros.cmake @@ -53,6 +53,11 @@ function (gmx_add_unit_test_library NAME) # Some false positives exist produced by GoogleTest implementation gmx_target_warning_suppression(${NAME} "-Wno-zero-as-null-pointer-constant" HAS_WARNING_NO_ZERO_AS_NULL_POINTER_CONSTANT) gmx_target_warning_suppression(${NAME} "-Wno-gnu-zero-variadic-macro-arguments" HAS_WARNING_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS) + if(GMX_GPU_CUDA) + # CUDA headers target C, so use old-style casts that clang + # warns about when it is the host compiler + gmx_target_warning_suppression(${NAME} "-Wno-old-style-cast" HAS_NO_OLD_STYLE_CAST) + endif() endif() endif() endfunction () @@ -183,6 +188,11 @@ function (gmx_add_gtest_executable EXENAME) # Some false positives exist produced by GoogleTest implementation gmx_target_warning_suppression(${EXENAME} "-Wno-zero-as-null-pointer-constant" HAS_WARNING_NO_ZERO_AS_NULL_POINTER_CONSTANT) gmx_target_warning_suppression(${EXENAME} "-Wno-gnu-zero-variadic-macro-arguments" HAS_WARNING_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS) + if(GMX_GPU_CUDA) + # CUDA headers target C, so use old-style casts that clang + # warns about when it is the host compiler + gmx_target_warning_suppression(${EXENAME} "-Wno-old-style-cast" HAS_NO_OLD_STYLE_CAST) + endif() endif() endif() endfunction() -- 2.22.0