diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
index 04f7238bb7483d2f756282422a6743a556da6e48..1075bf4bea0d4358be2d4cd6a9b0773f0083b787 100644
--- a/Code/Mantid/Build/CMake/CommonSetup.cmake
+++ b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -234,11 +234,14 @@ if ( CPPCHECK_EXECUTABLE )
     list( APPEND _cppcheck_xml_args --xml --xml-version=2 2> ${CMAKE_BINARY_DIR}/cppcheck.xml )
   endif (CPPCHECK_GENERATE_XML)
 
-add_custom_target ( cppcheck_byhand
-                    COMMAND ${CPPCHECK_EXECUTABLE} ${_cppcheck_args} . ${_cppcheck_xml_args}
-                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                    COMMENT "Running cppcheck"
-                  )
+  if (NOT TARGET cppcheck)
+    add_custom_target ( cppcheck
+                        COMMAND ${CPPCHECK_EXECUTABLE} ${_cppcheck_args} . ${_cppcheck_xml_args}
+                        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                        COMMENT "Running cppcheck"
+                      )
+    set_target_properties(cppcheck PROPERTIES EXCLUDE_FROM_ALL TRUE)
+  endif()
 endif ( CPPCHECK_EXECUTABLE )
 
 
diff --git a/Code/Mantid/Build/CMake/FindCppcheck.cmake b/Code/Mantid/Build/CMake/FindCppcheck.cmake
index a153abf5e9ef2df21edde3b5856a0accb61fd1a2..ec5e07b50674c591e27668810f5c82b616721f40 100644
--- a/Code/Mantid/Build/CMake/FindCppcheck.cmake
+++ b/Code/Mantid/Build/CMake/FindCppcheck.cmake
@@ -46,19 +46,19 @@ if(CPPCHECK_EXECUTABLE OR CPPCHECK_MARK_AS_ADVANCED)
 	mark_as_advanced(CPPCHECK_ROOT_DIR)
 endif()
 
-if(CPPCHECK_EXECUTABLE)
-  if(NOT TARGET cppcheck)
-    add_custom_target(cppcheck)
-    set_target_properties(cppcheck PROPERTIES EXCLUDE_FROM_ALL TRUE)
-  endif()
-  execute_process ( COMMAND ${CPPCHECK_EXECUTABLE} --version
-                    OUTPUT_VARIABLE CPPCHECK_VERSION
-		    OUTPUT_STRIP_TRAILING_WHITESPACE )
-  string ( TOUPPER ${CPPCHECK_VERSION} CPPCHECK_VERSION )
-  string ( REPLACE "CPPCHECK" "" CPPCHECK_VERSION ${CPPCHECK_VERSION} )
-  string ( STRIP ${CPPCHECK_VERSION} CPPCHECK_VERSION )
-  message ( STATUS "cppcheck version: ${CPPCHECK_VERSION}" )
-endif()
+#if(CPPCHECK_EXECUTABLE)
+#  if(NOT TARGET cppcheck)
+#    add_custom_target(cppcheck)
+#    set_target_properties(cppcheck PROPERTIES EXCLUDE_FROM_ALL TRUE)
+#  endif()
+#  execute_process ( COMMAND ${CPPCHECK_EXECUTABLE} --version
+#                    OUTPUT_VARIABLE CPPCHECK_VERSION
+#		    OUTPUT_STRIP_TRAILING_WHITESPACE )
+#  string ( TOUPPER ${CPPCHECK_VERSION} CPPCHECK_VERSION )
+#  string ( REPLACE "CPPCHECK" "" CPPCHECK_VERSION ${CPPCHECK_VERSION} )
+#  string ( STRIP ${CPPCHECK_VERSION} CPPCHECK_VERSION )
+#  message ( STATUS "cppcheck version: ${CPPCHECK_VERSION}" )
+#endif()
 
 mark_as_advanced(CPPCHECK_EXECUTABLE)
 set ( CPPCHECK_ARGS "--enable=all" CACHE STRING "Arguments for running cppcheck" )
diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
index 4e2899753b74318aa261250b599812e2188fa3f0..881e5bde9260366f8e19ddf1116cac9e798129d7 100644
--- a/Code/Mantid/Framework/API/CMakeLists.txt
+++ b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -272,7 +272,6 @@ endif ()
 ADD_PRECOMPILED_HEADER( inc/MantidAPI/PrecompiledHeader.h MantidAPI src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( API ${SRC_FILES} ${INC_FILES})
-add_cppcheck ( API )
 # Set the name of the generated library
 set_target_properties ( API PROPERTIES OUTPUT_NAME MantidAPI 
                                        COMPILE_DEFINITIONS IN_MANTID_API )
diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
index 591857693ac511ff83a2481b4e92f3364aed7134..49ba3fa39fa6724b6aa7b6908b592d2d2bb24353 100644
--- a/Code/Mantid/Framework/Algorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -540,7 +540,6 @@ endif(UNITY_BUILD)
 ADD_PRECOMPILED_HEADER( inc/MantidAlgorithms/PrecompiledHeader.h MantidAlgorithms src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( Algorithms ${SRC_FILES} ${INC_FILES})
-add_cppcheck ( Algorithms )
 # Set the name of the generated library
 set_target_properties ( Algorithms PROPERTIES OUTPUT_NAME MantidAlgorithms )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/Framework/Crystal/CMakeLists.txt b/Code/Mantid/Framework/Crystal/CMakeLists.txt
index cd690b4874ecd14fa1e1aa08299644afb823de05..ec19adbd5ae892c6b6d41e375eed9b19fd173168 100644
--- a/Code/Mantid/Framework/Crystal/CMakeLists.txt
+++ b/Code/Mantid/Framework/Crystal/CMakeLists.txt
@@ -86,7 +86,6 @@ endif(UNITY_BUILD)
 
 # Add the target for this directory
 add_library ( Crystal ${SRC_FILES} ${INC_FILES})
-add_cppcheck( Crystal )
 # Set the name of the generated library
 set_target_properties ( Crystal PROPERTIES OUTPUT_NAME MantidCrystal )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
index 62c14191daf664a8bc2ceb7fc5c1254033c46a1d..a23c3ff030a1a3d32890f428eeb045dbd916f872 100644
--- a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
+++ b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
@@ -131,7 +131,6 @@ endif(UNITY_BUILD)
 ADD_PRECOMPILED_HEADER( inc/MantidCurveFitting/PrecompiledHeader.h MantidCurveFitting src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( CurveFitting ${SRC_FILES} ${INC_FILES})
-add_cppcheck( CurveFitting )
 # Set the name of the generated library
 set_target_properties ( CurveFitting PROPERTIES OUTPUT_NAME MantidCurveFitting )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
index 23782d1c3a4322e8b732cf5dd6790634cceabf21..2c6e691c71067d4c379d84450f46eae84118850d 100644
--- a/Code/Mantid/Framework/DataHandling/CMakeLists.txt
+++ b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -312,7 +312,6 @@ endif(UNITY_BUILD)
 ADD_PRECOMPILED_HEADER( inc/MantidDataHandling/PrecompiledHeader.h MantidDataHandling src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( DataHandling ${SRC_FILES} ${INC_FILES})
-add_cppcheck( DataHandling )
 # Set the name of the generated library
 set_target_properties ( DataHandling PROPERTIES OUTPUT_NAME MantidDataHandling )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/Framework/DataObjects/CMakeLists.txt b/Code/Mantid/Framework/DataObjects/CMakeLists.txt
index df1c2ca90e7e26cf7c9018c6f5b94232bf8d6a40..404d2fdba897c2767c060f42c4e21d3ba49d6435 100644
--- a/Code/Mantid/Framework/DataObjects/CMakeLists.txt
+++ b/Code/Mantid/Framework/DataObjects/CMakeLists.txt
@@ -95,7 +95,6 @@ endif(UNITY_BUILD)
 ADD_PRECOMPILED_HEADER( inc/MantidDataObjects/PrecompiledHeader.h MantidDataObjects src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( DataObjects ${SRC_FILES} ${INC_FILES})
-add_cppcheck( DataObjects )
 # Set the name of the generated library
 set_target_properties ( DataObjects PROPERTIES OUTPUT_NAME MantidDataObjects 
                                                COMPILE_DEFINITIONS IN_MANTID_DATA_OBJECTS )
diff --git a/Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt
index 2d2d7badbafd636746712beb52c02fb7d6125cc9..3bbf129d9375b0b4a3f248e7637a6b30190a2835 100644
--- a/Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/GPUAlgorithms/CMakeLists.txt
@@ -23,7 +23,6 @@ set ( KERNEL_FILES
 
 # Add the target for this directory
 add_library ( GPUAlgorithms ${SRC_FILES} ${INC_FILES} )
-add_cppcheck( GPUAlgorithms )
 # Set the name of the generated library
 set_target_properties ( GPUAlgorithms PROPERTIES OUTPUT_NAME MantidGPUAlgorithms )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/Framework/Geometry/CMakeLists.txt b/Code/Mantid/Framework/Geometry/CMakeLists.txt
index 689501642c7de71c503698fc9628b9df6cc8088a..d857425f561ead221b0f9d76ee529b2e65e49992 100644
--- a/Code/Mantid/Framework/Geometry/CMakeLists.txt
+++ b/Code/Mantid/Framework/Geometry/CMakeLists.txt
@@ -282,7 +282,6 @@ endif ()
 ADD_PRECOMPILED_HEADER( inc/MantidGeometry/PrecompiledHeader.h MantidGeometry src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( Geometry ${SRC_FILES} ${INC_FILES} )
-add_cppcheck( Geometry )
 # Set the name of the generated library
 set_target_properties ( Geometry PROPERTIES OUTPUT_NAME MantidGeometry 
                                             COMPILE_DEFINITIONS IN_MANTID_GEOMETRY )
diff --git a/Code/Mantid/Framework/ICat/CMakeLists.txt b/Code/Mantid/Framework/ICat/CMakeLists.txt
index 7ad5ccc60547a69ebcef675714209d32b271bb7b..29bc0baf01a3e2961e090296968393149ace66ce 100644
--- a/Code/Mantid/Framework/ICat/CMakeLists.txt
+++ b/Code/Mantid/Framework/ICat/CMakeLists.txt
@@ -65,13 +65,6 @@ add_definitions ( -DWITH_OPENSSL -DWITH_NONAMESPACES )
 ADD_PRECOMPILED_HEADER( inc/MantidICat/PrecompiledHeader.h MantidICat src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( ICat ${SRC_FILES} ${INC_FILES})
-add_cppcheck( ICat
-              inc/MantidICat/GSoapGenerated/soapH.h
-              inc/MantidICat/GSoapGenerated/soapICATPortBindingProxy.h
-              inc/MantidICat/GSoapGenerated/soapStub.h
-              src/GSoapGenerated.cpp
-              src/GSoapGenerated/soapC.cpp
-              src/GSoapGenerated/soapICATPortBindingProxy.cpp )
 # Set the name of the generated library
 set_target_properties ( ICat PROPERTIES OUTPUT_NAME MantidICat 
                                         COMPILE_DEFINITIONS IN_MANTID_ICAT )
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
index c4b44e5b53b948873c184bf8348583f0ce995ef9..598d07a11f8a4e46e28c7610ee61af12f44f6c2a 100644
--- a/Code/Mantid/Framework/Kernel/CMakeLists.txt
+++ b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -278,7 +278,6 @@ endif(UNITY_BUILD)
 ADD_PRECOMPILED_HEADER ( inc/MantidKernel/PrecompiledHeader.h MantidKernel src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( Kernel ${SRC_FILES} ${INC_FILES} )
-add_cppcheck( Kernel )
 # Set the name of the generated library
 set_target_properties ( Kernel PROPERTIES OUTPUT_NAME MantidKernel 
                                           COMPILE_DEFINITIONS "IN_MANTID_KERNEL;PSAPI_VERSION=1" )
diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
index a4ffcbfd3672886251a89a85df0d68ff368ba19c..01290e8b7a65a468d0fc72428ecf4913c20b68c6 100644
--- a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -131,7 +131,6 @@ endif(UNITY_BUILD)
 ADD_PRECOMPILED_HEADER( inc/MantidMDAlgorithms/PrecompiledHeader.h MantidMDAlgorithms src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( MDAlgorithms ${SRC_FILES} ${INC_FILES})
-add_cppcheck( MDAlgorithms )
 # Set the name of the generated library
 set_target_properties ( MDAlgorithms PROPERTIES OUTPUT_NAME MantidMDAlgorithms 
                                                 COMPILE_DEFINITIONS IN_MANTID_MDALGORITHMS )
diff --git a/Code/Mantid/Framework/MDEvents/CMakeLists.txt b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
index d9b21a549becaa8bac0b82ca1734bf34abf85aa7..bb8f27472284582400caa0f9fa0bd3dd9c1c45fc 100644
--- a/Code/Mantid/Framework/MDEvents/CMakeLists.txt
+++ b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
@@ -143,7 +143,6 @@ endif(UNITY_BUILD)
 ADD_PRECOMPILED_HEADER( inc/MantidMDEvents/PrecompiledHeader.h MantidMDEvents src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( MDEvents ${SRC_FILES} ${INC_FILES})
-add_cppcheck( MDEvents )
 # Set the name of the generated library
 set_target_properties ( MDEvents PROPERTIES OUTPUT_NAME MantidMDEvents 
                                                  COMPILE_DEFINITIONS IN_MANTID_MDEVENT )
diff --git a/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt
index bb2bd0834559b65b35129e8ea5e388f026db9ce8..87d3d652cc5fdd1eac125aede5a6b23cc3750e81 100644
--- a/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/MPIAlgorithms/CMakeLists.txt
@@ -12,7 +12,6 @@ set ( TEST_FILES test/BroadcastWorkspaceTest.h
 
 # Add the target for this directory
 add_library ( MPIAlgorithms ${SRC_FILES} ${INC_FILES} )
-add_cppcheck( MPIAlgorithms )
 # Set the name of the generated library
 set_target_properties ( MPIAlgorithms PROPERTIES OUTPUT_NAME MantidMPIAlgorithms )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/Framework/MatlabAPI/CMakeLists.txt b/Code/Mantid/Framework/MatlabAPI/CMakeLists.txt
index 18e51efcb2a079a682ab742467d528ea6a7b2173..2923171c59a1538de1eb77b9d212182b525e9af0 100644
--- a/Code/Mantid/Framework/MatlabAPI/CMakeLists.txt
+++ b/Code/Mantid/Framework/MatlabAPI/CMakeLists.txt
@@ -9,7 +9,6 @@ add_definitions ( -DIN_MANTID_MATLAB_API -DMATLAB_MEX_FILE=1 )
 include_directories ( inc )
 include_directories ( ${MATLAB_INCLUDE_DIR} ${MATLAB_EXTERN_SRC} )
 add_library ( MatlabAPI ${SRC_FILES} ${INC_FILES})
-add_cppcheck( MatlabAPI )
 # Set the name of the generated library
 set_target_properties ( MatlabAPI PROPERTIES OUTPUT_NAME MantidMatlabAPI )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/Framework/Nexus/CMakeLists.txt b/Code/Mantid/Framework/Nexus/CMakeLists.txt
index 2d1fcb5567b85a17d008ea19098ffb46af865a05..4ae945710347d2996d181fcc1ee3138aa18c0fb4 100644
--- a/Code/Mantid/Framework/Nexus/CMakeLists.txt
+++ b/Code/Mantid/Framework/Nexus/CMakeLists.txt
@@ -19,7 +19,6 @@ add_definitions ( -DIN_NEXUS_CPP_LIBRARY )
 
 # Add the target for this directory
 add_library ( Nexus ${SRC_FILES} ${INC_FILES})
-add_cppcheck( Nexus )
 # Set the name of the generated library
 set_target_properties ( Nexus PROPERTIES OUTPUT_NAME MantidNexus 
                                          COMPILE_DEFINITIONS IN_MANTID_NEXUS )
diff --git a/Code/Mantid/Framework/NexusCPP/CMakeLists.txt b/Code/Mantid/Framework/NexusCPP/CMakeLists.txt
index 3bd48f684220d98045cd9f963107b90af5e40c36..8c5b57925bcb6bc5e5be28c35f41f270dd3ccfee 100644
--- a/Code/Mantid/Framework/NexusCPP/CMakeLists.txt
+++ b/Code/Mantid/Framework/NexusCPP/CMakeLists.txt
@@ -17,7 +17,6 @@ add_definitions ( -DIN_NEXUS_CPP_LIBRARY )
 
 # Add the target for this directory
 add_library ( NexusCPP ${SRC_FILES} ${INC_FILES})
-add_cppcheck( NexusCPP )
 # Set the name of the generated library
 set_target_properties ( NexusCPP PROPERTIES OUTPUT_NAME MantidNexusCPP 
                                             COMPILE_DEFINITIONS IN_MANTID_NEXUSCPP )
diff --git a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
index 42d826a6df91dfbeba4a55eb69207796f91d8bb8..808f2d1fc10de16cce2ce85c24a9aeb37e995268 100644
--- a/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
+++ b/Code/Mantid/Framework/PythonAPI/CMakeLists.txt
@@ -90,11 +90,9 @@ endforeach ( PYFILE )
 ###########################################################################
 
 add_library ( PythonAPI ${SRC_FILES} ${INC_FILES} ${BOOST_SRC} ${PYTHON_INSTALL_FILES} )
-add_cppcheck( PythonAPI )
 if ( UNIX )
   set ( DLOPEN_SRC src/dlopen.c )
   add_library ( dlopen ${DLOPEN_SRC} )
-  add_cppcheck( dlopen )
 if ( APPLE )
   # and in .so on the Mac
   # Need to remove OpenMP
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
index eff8223b6763912efebde9dcac61d18f93135b70..501c7258084325cdb930d9043be7bc4119909f2f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
@@ -81,7 +81,6 @@ endforeach ( PYFILE )
 #############################################################################################
 
 add_library ( PythonAPIModule ${SRC_FILES} ${INC_FILES} ${PYTHON_INSTALL_FILES} )
-add_cppcheck( PythonAPIModule )
 set_python_properties( PythonAPIModule _api )
 set_target_output_directory ( PythonAPIModule ${OUTPUT_DIR} .pyd )
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
index 20211daecce845486f6361f0b5275d686825cfca..cc179b41421b3a39215efb46c620fb4adc21c513 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
@@ -58,7 +58,6 @@ endforeach ( PYFILE )
 #############################################################################################
 
 add_library ( PythonGeometryModule ${SRC_FILES} ${INC_FILES} ${PYTHON_INSTALL_FILES} )
-add_cppcheck( PythonGeometryModule )
 set_python_properties( PythonGeometryModule _geometry )
 set_target_output_directory ( PythonGeometryModule ${OUTPUT_DIR} .pyd )
 # Add the required dependencies
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
index 9e4657cf9b20bcdc4aadb0c32a9a9cf52d706212..8f82865900f2d73db971a7909e05287ae0fe4123 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
@@ -79,7 +79,6 @@ endforeach ( PYFILE )
 #############################################################################################
 
 add_library ( PythonKernelModule ${SRC_FILES} ${BOOST_PYTHON_SRC} ${INC_FILES} ${PYTHON_INSTALL_FILES} )
-add_cppcheck( PythonKernelModule )
 set_python_properties( PythonKernelModule _kernel )
 set_target_output_directory ( PythonKernelModule ${OUTPUT_DIR} .pyd )
 # Add the required dependencies
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt
index d3e09704fcf98bfa7496889c6c08b8d8acda9be5..ecc0d18b4dd4aca64e37c95723dc7fc3c5c181f7 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/CMakeLists.txt
@@ -46,7 +46,6 @@ set ( TEST_PY_FILES test/EQSANSQ2DTest.py test/EQSANSSensitivityCorrectionTest.p
 ADD_PRECOMPILED_HEADER( inc/MantidWorkflowAlgorithms/PrecompiledHeader.h MantidWorkflowAlgorithms src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library ( WorkflowAlgorithms ${SRC_FILES} ${INC_FILES})
-add_cppcheck( WorkflowAlgorithms )
 # Set the name of the generated library
 set_target_properties ( WorkflowAlgorithms PROPERTIES OUTPUT_NAME MantidWorkflowAlgorithms )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
index 46872a589b3f7f17d36438f204f9a1fd3f455cc6..4389b883e3b17288b2efb02c9d88795deff3499a 100644
--- a/Code/Mantid/MantidPlot/CMakeLists.txt
+++ b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -762,7 +762,6 @@ add_executable ( MantidPlot ${WIN_CONSOLE} MACOSX_BUNDLE ${ALL_SRC} src/main.cpp
 							${INC_FILES} ${QTIPLOT_C_SRC} ${UI_HDRS} 
 							${RES_FILES} ${MANTID_RC_FILE}
 )
-add_cppcheck   ( MantidPlot )
 
 # Library dependencies
 target_link_libraries ( MantidPlot 
diff --git a/Code/Mantid/MantidQt/API/CMakeLists.txt b/Code/Mantid/MantidQt/API/CMakeLists.txt
index 74b855adc175895ab2a400b28f52fc3f3c0935fe..cd7eddff88ca5b8dbb8d5693253c4e08cb268ade 100644
--- a/Code/Mantid/MantidQt/API/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/API/CMakeLists.txt
@@ -74,7 +74,6 @@ add_definitions ( -DIN_MANTIDQT_API )
 # Use a precompiled header where they are supported
 ADD_PRECOMPILED_HEADER( inc/MantidQtAPI/PrecompiledHeader.h MantidQtAPI src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
 add_library ( MantidQtAPI ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
-add_cppcheck( MantidQtAPI )
 
 target_link_libraries ( MantidQtAPI ${CORE_MANTIDLIBS} ${QT_LIBRARIES} ${QWT_LIBRARIES} )
 
diff --git a/Code/Mantid/MantidQt/CMakeLists.txt b/Code/Mantid/MantidQt/CMakeLists.txt
index 571700dc406afaef8912d05ce65b617e24cf1275..d51fd061fbeab5cea7fc38d8cb494f73c882c1b5 100644
--- a/Code/Mantid/MantidQt/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CMakeLists.txt
@@ -107,7 +107,6 @@ include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/SliceViewer ) # to find the ui
 
 # This creates the target library, just for python bindings
 add_library ( mantidqtpython MODULE ${SIP_SRC} )
-add_cppcheck( mantidqtpython )
 
 if(WIN32)
 	# Windows: Python library name needs to end in .pyd for Windows
diff --git a/Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt b/Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt
index c0ab1f8d352cc6f90047c312df83290fa0de4b80..dd60f1f11ba19523ce38f6cec9e1d677268250ce 100644
--- a/Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt
@@ -64,7 +64,6 @@ endif(UNITY_BUILD)
 # Use a precompiled header where they are supported
 ADD_PRECOMPILED_HEADER( inc/MantidQtCustomDialogs/PrecompiledHeader.h MantidQtCustomDialogs src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
 add_library ( CustomDialogs ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
-add_cppcheck( CustomDialogs )
 # Set the name of the generated library
 set_target_properties ( CustomDialogs PROPERTIES OUTPUT_NAME MantidQtCustomDialogs )
 
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
index 764b1900b5e90216d0c5f414c7d5507af6be1fee..955d65a1392b89bf850cc71117c060f8595a82d1 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -105,7 +105,6 @@ endif(UNITY_BUILD)
 # Use a precompiled header where they are supported
 ADD_PRECOMPILED_HEADER( inc/MantidQtCustomInterfaces/PrecompiledHeader.h MantidQtCustomInterfaces src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
 add_library ( CustomInterfaces ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
-add_cppcheck( CustomInterfaces )
 
 # Set the name of the generated library
 set_target_properties ( CustomInterfaces PROPERTIES OUTPUT_NAME MantidQtCustomInterfaces )
diff --git a/Code/Mantid/MantidQt/DesignerPlugins/CMakeLists.txt b/Code/Mantid/MantidQt/DesignerPlugins/CMakeLists.txt
index d57eb10cb059b78324046d9499fbcb0b37ed6ea8..41de695240487229477e2df641c9ab6197ae1d68 100644
--- a/Code/Mantid/MantidQt/DesignerPlugins/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/DesignerPlugins/CMakeLists.txt
@@ -36,7 +36,6 @@ if(UNITY_BUILD)
 endif(UNITY_BUILD)
 
 add_library ( DesignerPlugins ${SRC_FILES} ${INC_FILES} ${MOCCED_FILES} )
-add_cppcheck( DesignerPlugins )
 
 # Change the destination of the target as Qt expects this in a directory called "designer"
 SET_TARGET_OUTPUT_DIRECTORY( DesignerPlugins ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/designer )
diff --git a/Code/Mantid/MantidQt/Factory/CMakeLists.txt b/Code/Mantid/MantidQt/Factory/CMakeLists.txt
index a8550a41d0906e3d086f6c2d27fdb0bb3f16f95e..1545e3877071b1ad3d0aa2fee7bf5e4d6a120bbd 100644
--- a/Code/Mantid/MantidQt/Factory/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/Factory/CMakeLists.txt
@@ -38,7 +38,6 @@ add_definitions ( -DIN_MANTIDQT_FACTORY )
 
 # This creates the target library
 add_library ( MantidQtFactory ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
-add_cppcheck( MantidQtFactory )
 
 # ... and links to other required libs
 target_link_libraries ( MantidQtFactory MantidQtAPI QtPropertyBrowser MantidQtSliceViewer ${QT_LIBRARIES} ${QWT_LIBRARIES} )
diff --git a/Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt b/Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt
index a014b1815cbee0042a3ea3dfcecbf6d2452c794e..bc9918532a70bbb374b34b425bfc30a782713ff2 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt
@@ -99,7 +99,6 @@ add_definitions ( -DIN_MANTIDQT_MANTIDWIDGETS )
 # Use a precompiled header where they are supported
 ADD_PRECOMPILED_HEADER( inc/MantidQtMantidWidgets/PrecompiledHeader.h MantidQtMantidWidgets src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
 add_library ( MantidWidgets ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
-add_cppcheck( MantidWidgets )
 
 target_link_libraries ( MantidWidgets MantidQtAPI QtPropertyBrowser ${QT_LIBRARIES} ${QWT_LIBRARIES} )
 
diff --git a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
index 8cd502480ebbecee02f377857cfc9cf491d55615..8e5c746aa47d2575548600fd8ed46609071ad297 100644
--- a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
+++ b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
@@ -80,7 +80,6 @@ add_definitions ( -DIN_MANTIDQT_SLICEVIEWER )
 
 # This creates the target library
 add_library ( MantidQtSliceViewer ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
-add_cppcheck( MantidQtSliceViewer )
 
 # ... and links to other required libs
 target_link_libraries ( MantidQtSliceViewer MantidQtAPI QtPropertyBrowser ${QT_LIBRARIES} ${QWT_LIBRARIES} )
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/QtWidgets/CMakeLists.txt b/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/QtWidgets/CMakeLists.txt
index c430b2b08210ab773453ee2f4455e3feaffe8ba9..9224f28ca8a9769e6f6afdfceaa9829c0152b45c 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/QtWidgets/CMakeLists.txt
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewWidgets/QtWidgets/CMakeLists.txt
@@ -27,7 +27,6 @@ qt4_wrap_cpp( MOCCED_FILES ${HDR_FILES} )
 
 project( MantidParaViewQtWidgets )
 add_library( MantidParaViewQtWidgets ${SRC_FILES} ${MOCCED_FILES} ${INC_FILES} ) 
-add_cppcheck( MantidParaViewQtWidgets )
 # Add to the 'Vates' group in VS
 set_property( TARGET MantidParaViewQtWidgets PROPERTY FOLDER "MantidVates" )
 target_link_libraries( MantidParaViewQtWidgets ${QT_LIBRARIES} 
diff --git a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
index 04aaabf36676afc3aff046e280707df1f794cc7e..42bc5493ad5132604c422498f02279de58f94686 100644
--- a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
+++ b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
@@ -160,7 +160,6 @@ add_definitions( -DIN_MANTID_VATESAPI )
 ADD_PRECOMPILED_HEADER( inc/MantidVatesAPI/PrecompiledHeader.h MantidVatesAPI src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
 # Add the target for this directory
 add_library( VatesAPI ${SRC_FILES} ${INC_FILES} )
-add_cppcheck( VatesAPI )
 # Set the name of the generated library
 set_target_properties( VatesAPI PROPERTIES OUTPUT_NAME MantidVatesAPI )
 # Add to the 'Framework' group in VS
diff --git a/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/CMakeLists.txt
index acd784040e994c6cb509ed9efaddb5001a6d6ff7..395c2ef3bda150981c5510e1848c689a928fd7a0 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/CMakeLists.txt
+++ b/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/CMakeLists.txt
@@ -60,7 +60,6 @@ ${RES_FILES}
 add_definitions( -DIN_MANTID_VATES_SIMPLEGUI_QTWIDGETS )
 # Add the target for this directory
 add_library( VatesSimpleGuiQtWidgets ${ALL_FILES} )
-add_cppcheck( VatesSimpleGuiQtWidgets )
 # Set the name of the generated library
 set_target_properties( VatesSimpleGuiQtWidgets PROPERTIES OUTPUT_NAME MantidVatesSimpleGuiQtWidgets )
 # Add to the 'VatesSimpleGui' group in VS
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
index 87eeec937f50abf7ac087ab57e082e953a4ad5d9..51324714fbb4b5b0857dca64667187dbc963d690 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -76,7 +76,6 @@ ${RES_FILES}
 add_definitions( -DIN_MANTID_VATES_SIMPLEGUI_VIEWWIDGETS )
 # Add the target for this directory
 add_library( VatesSimpleGuiViewWidgets ${ALL_FILES} )
-add_cppcheck( VatesSimpleGuiViewWidgets )
 # Set the name of the generated library
 set_target_properties( VatesSimpleGuiViewWidgets PROPERTIES OUTPUT_NAME MantidVatesSimpleGuiViewWidgets )
 # Add to the 'VatesSimpleGui' group in VS