Refs #6098. Fixing header file suppression.

mantidproject · Dec 4, 2012 · bbbceee · bbbceee
1 parent 5ef2bab
commit bbbceee
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -224,11 +224,15 @@ if ( CPPCHECK_EXECUTABLE )
         Framework/ICat/src/GSoap.cpp
         Framework/Kernel/src/ANN/
         Framework/Kernel/src/ANN_complete.cpp
-        Framework/PythonAPI/src/boostpython.cpp
-        MantidPlot/src/origin/OPJFile.h
+        Framework/PythonAPI/src/boostpython.cpp 
         MantidPlot/src/origin/OPJFile.cpp
       )
 
+  # Header files to be ignored require different handling
+  set ( CPPCHECK_HEADER_EXCLUDES
+        MantidPlot/src/origin/OPJFile.h
+      )
+
   # setup the standard arguments
   set (_cppcheck_args "${CPPCHECK_ARGS}")
     list ( APPEND _cppcheck_args ${CPPCHECK_TEMPLATE_ARG} )
@@ -265,6 +269,16 @@ if ( CPPCHECK_EXECUTABLE )
   endforeach()
   list ( APPEND _cppcheck_args ${_cppcheck_excludes} )
 
+  # Handle header files in the required manner
+  set (_cppcheck_header_excludes)
+  foreach( _file ${CPPCHECK_HEADER_EXCLUDES} )
+    set ( _tmp "${CMAKE_SOURCE_DIR}/${_file}" )
+    if ( EXISTS ${_tmp} )
+      list ( APPEND _cppcheck_header_excludes --suppress=*:${_tmp} )
+    endif()
+  endforeach()
+  list ( APPEND _cppcheck_args ${_cppcheck_header_excludes} )
+
   # put the finishing bits on the final command call
   set (_cppcheck_xml_args)
   if (CPPCHECK_GENERATE_XML)
@@ -276,7 +290,7 @@ if ( CPPCHECK_EXECUTABLE )
   # generate the target
   if (NOT TARGET cppcheck)
     add_custom_target ( cppcheck
-                        COMMAND ${CPPCHECK_EXECUTABLE} ${_cppcheck_args} ${_cppcheck_xml_args}
+                        COMMAND ${CPPCHECK_EXECUTABLE} ${_cppcheck_args} ${_cppcheck_header_excludes} ${_cppcheck_xml_args}
                         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                         COMMENT "Running cppcheck"
                       )