From f64eebb35b453b9e86d7c2fe78cb86bf37c05ee2 Mon Sep 17 00:00:00 2001 From: Aleksei Iupinov Date: Mon, 24 Oct 2016 12:58:27 +0200 Subject: [PATCH] Treat CUDA files as C++ during cppcheck CUDA sources (*.cu) were treated as plain C for cppcheck purposes, but should be treated as C++. Some outdated CUDA suppressions removed. Change-Id: I26fb768464660da1e569dda6d844a63ee2823313 --- tests/CppCheck.cmake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/CppCheck.cmake b/tests/CppCheck.cmake index 30079305b8..61826c1ce2 100644 --- a/tests/CppCheck.cmake +++ b/tests/CppCheck.cmake @@ -88,12 +88,7 @@ if (CPPCHECK_EXECUTABLE AND UNIX) --suppress=invalidscanf --suppress=sizeofCalculation --suppress=invalidscanf_libc - --suppress=missingInclude:src/programs/mdrun/gmx_gpu_utils/gmx_gpu_utils.cu --suppress=*:src/external/Random123-1.08/include/Random123/features/compilerfeatures.h - --suppress=invalidPointerCast:src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh - --suppress=passedByValue:src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh - --suppress=passedByValue:src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_utils.cuh - --suppress=shiftTooManyBits:src/gromacs/gpu_utils/gpu_utils.cu ) set(_cxx_flags -D__cplusplus @@ -110,6 +105,7 @@ if (CPPCHECK_EXECUTABLE AND UNIX) --suppress=unusedStructMember:src/gromacs/selection/selhelp.cpp --suppress=redundantPointerOp:src/gromacs/fileio/gmxfio-xdr.cpp --suppress=passedByValue # See comment below + --suppress=shiftTooManyBits:src/gromacs/gpu_utils/gpu_utils.cu # CUDA kernel launch false positive ) # Passing non-trivial objects by value is rarely a problem for # GROMACS in performance-sensitive code, and shouldn't be @@ -126,7 +122,7 @@ if (CPPCHECK_EXECUTABLE AND UNIX) set(_target_name cppcheck-${_filename}.${_outputext}) string(REPLACE "/" "_" _target_name ${_target_name}) list(APPEND _filelist ${_target_name}) - if (_filename MATCHES "\\.cpp$") + if (_filename MATCHES "\\.cpp$" OR _filename MATCHES "\\.cu$") set(_lang CXX) set(_lang_flags ${_cxx_flags}) else() -- 2.11.4.GIT