Merge branch 'cppcheck_ana' into 'main'

Projects: move CPPCHECK option to Athena project

Closes ATLINFR-5672

See merge request !77863

Control/CxxUtils/cmake/CxxUtilsSettingsConfig.cmake

-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 #
 # Additional CMake settings for the build. Used by Projects/.
 #
@@ -29,9 +29,6 @@ endif()
 set( ATLAS_GCC_CHECKERS_CONFIG ${_config}
    CACHE STRING "Configuration file(s) for the GCC checker plugins" FORCE )
 
-# CppCheck options:
-option( ATLAS_USE_CPPCHECK "Use CppCheck in the build" ON )
-
 # User-defined cppcheck command line options:
 set( ATLAS_CPPCHECK_OPTIONS "--enable=warning,portability,performance"
    CACHE STRING "cppcheck user-defined command line options" )

Projects/Athena/CMakeLists.txt

@@ -79,6 +79,9 @@ set( CxxUtilsSettings_DIR
    "${CMAKE_SOURCE_DIR}/../../Control/CxxUtils/cmake" )
 find_package( CxxUtilsSettings )
 
+# Enable CppCheck:
+option( ATLAS_USE_CPPCHECK "Use CppCheck in the build" ON )
+
 # Decide whether to enable LTO for AtlasGeant4 and its OBJECT libs
 include( CheckIPOSupported )
 check_ipo_supported( RESULT ATLAS_IPO_CHECK_RESULT )

Projects/Athena/cmake/PreConfig.cmake.in

@@ -29,6 +29,9 @@ set( ATLAS_FLAKE8 @ATLAS_FLAKE8@
 set( ATLAS_PYTHON_CHECKER @ATLAS_PYTHON_CHECKER@
    CACHE STRING "Python checker command to run during Python module compilation" )
 
+# CppCheck
+option( ATLAS_USE_CPPCHECK "Use CppCheck in the build" @ATLAS_USE_CPPCHECK@ )
+
 # Decide whether to enable LTO for AtlasGeant4 and its OBJECT libs
 set( ATLAS_GEANT4_USE_LTO @ATLAS_GEANT4_USE_LTO@ CACHE BOOL
    "Use link-time-optimization in building AtlasGeant4" )