Merge pull request #6226 from nilsvu/fix_clang_tidy

Fix clang-tidy on CI
sxs-collaboration · Aug 18, 2024 · e740611 · e740611
2 parents 25e11e1 + 1205ed9
commit e740611
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/cmake/SetupBlaze.cmake b/cmake/SetupBlaze.cmake
@@ -143,10 +143,13 @@ target_compile_definitions(Blaze
   BLAZE_USE_ALWAYS_INLINE=${_BLAZE_USE_ALWAYS_INLINE}
   )
 
-target_precompile_headers(Blaze
-  INTERFACE
-  ${CMAKE_SOURCE_DIR}/tools/BlazeExceptions.hpp
-  )
+# We need to make sure `BlazeExceptions.hpp` is included. It is included in the
+# PCH (see tools/SpectrePch.hpp). If there's no PCH, we need to include it here.
+if (NOT USE_PCH)
+  target_compile_options(Blaze
+    INTERFACE
+    "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include Utilities/BlazeExceptions.hpp>")
+endif()
 
 add_interface_lib_headers(
   TARGET Blaze

diff --git a/tools/BlazeExceptions.hpp → src/Utilities/BlazeExceptions.hpp b/tools/BlazeExceptions.hpp → src/Utilities/BlazeExceptions.hpp
@@ -1,6 +1,8 @@
 // Distributed under the MIT License.
 // See LICENSE.txt for details.
 
+#pragma once
+
 #include <csignal>
 
 #ifdef __CUDA_ARCH__
@@ -9,9 +11,6 @@
 #define BLAZE_USE_VECTORIZATION 0
 #endif
 
-#ifndef SPECTRE_BLAZE_EXCEPTIONS_HPP
-#define SPECTRE_BLAZE_EXCEPTIONS_HPP
-
 #ifdef SPECTRE_DEBUG
 #define BLAZE_THROW(EXCEPTION)           \
   struct sigaction handler {};           \
@@ -24,4 +23,3 @@
 #else  // SPECTRE_DEBUG
 #define BLAZE_THROW(EXCEPTION)
 #endif  // SPECTRE_DEBUG
-#endif  // BLAZE_EXCEPTIONSSPECTRE_BLAZE_EXCEPTIONS_HPP
diff --git a/src/Utilities/CMakeLists.txt b/src/Utilities/CMakeLists.txt
@@ -30,6 +30,7 @@ spectre_target_headers(
   Array.hpp
   Base64.hpp
   Blas.hpp
+  BlazeExceptions.hpp
   CachedFunction.hpp
   CallWithDynamicType.hpp
   CartesianProduct.hpp

diff --git a/tools/SpectrePch.hpp b/tools/SpectrePch.hpp
@@ -7,14 +7,16 @@
 // Include STL headers
 #include <algorithm>
 #include <array>
-#include <csignal>  // For Blaze error handling (see SetupBlaze.cmake)
 #include <cstddef>
 #include <limits>
 #include <memory>
 #include <ostream>
 #include <utility>
 #include <vector>
 
+// For Blaze error handling (see SetupBlaze.cmake)
+#include <Utilities/BlazeExceptions.hpp>
+
 #include <Utilities/ErrorHandling/Assert.hpp>
 #include <blaze/math/CustomVector.h>
 #include <blaze/math/DenseVector.h>