cmake cleanup and more icwyu

GMLC-TDC · Oct 16, 2024 · dc05e30 · dc05e30
1 parent 1f2a0ce
commit dc05e30
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/static-analyzers.yml b/.github/workflows/static-analyzers.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Run cpplint
-      run: cpplint --counting=detailed --recursive examples benchmarks src tests
+      run: cpplint --counting=detailed --exclude=*.c --recursive examples benchmarks src tests
 
   clang-tidy:
     if: github.event_name == 'pull_request'

diff --git a/config/cmake/addSpdlog.cmake b/config/cmake/addSpdlog.cmake
@@ -26,7 +26,11 @@ if(NOT TARGET spdlog::spdlog)
         set(SPDLOG_FMT_EXTERNAL ON CACHE INTERNAL "")
 
         # use the vendored SPDLOG library
-        add_subdirectory(ThirdParty/spdlog)
+        if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.25)
+            add_subdirectory(ThirdParty/spdlog EXCLUDE_FROM_ALL SYSTEM)
+        else()
+            add_subdirectory(ThirdParty/spdlog EXCLUDE_FROM_ALL)
+        endif()
 
         set_target_properties(spdlog PROPERTIES FOLDER Extern)
         hide_variable(SPDLOG_BUILD_ALL)

diff --git a/config/cmake/addUtilities.cmake b/config/cmake/addUtilities.cmake
@@ -9,7 +9,7 @@
 
 if(NOT TARGET gmlc::utilities)
     set(GMLC_UTILITIES_INSTALL OFF CACHE INTERNAL "")
-
+    
     add_subdirectory(ThirdParty/utilities)
 
     hide_variable(GMLC_UTILITIES_GENERATE_DOXYGEN_DOC)

diff --git a/tests/helics/shared_library/iterationTests.cpp b/tests/helics/shared_library/iterationTests.cpp
@@ -13,6 +13,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <iostream>
 #include <string>
 #include <utility>
+#include <vector>
 
 struct iteration_tests: public FederateTestFixture, public ::testing::Test {};
 

diff --git a/tests/helics/shared_library/test-combo-federate_cpp.cpp b/tests/helics/shared_library/test-combo-federate_cpp.cpp
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "gtest/gtest.h"
 #include <future>
 #include <iostream>
+#include <string>
 
 /** these test cases test out the value converters and some of the other functions
  */