Remove unused #includes as identified by include-what-you-use

NeilJustice · Jan 17, 2025 · b3d3807 · b3d3807
1 parent f345fb2
commit b3d3807
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,6 +40,13 @@ if(UNIX)
       add_library(CodeCovLibraryInterface INTERFACE)
       target_compile_options(CodeCovLibraryInterface INTERFACE -O0 -g --coverage)
       target_link_libraries(CodeCovLibraryInterface INTERFACE --coverage)
+   elseif(IncludeWhatYouUseMode)
+      replace(CMAKE_CXX_FLAGS_DEBUG "-g" "")
+      set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "/usr/bin/include-what-you-use"
+         "-Xiwyu" "--keep=*pch.h"
+         "-Xiwyu" "--cxx17ns"
+         "-Xiwyu" "--error_always=0")
+      message("IncludeWhatYouUseMode enabled: CMAKE_CXX_INCLUDE_WHAT_YOU_USE set to /usr/bin/include-what-you-use with precompiled headers and unity builds disabled")
    endif()
 elseif(MSVC)
    set_property(GLOBAL PROPERTY USE_FOLDERS ON)

diff --git a/FileArb/FileArbMain.cpp b/FileArb/FileArbMain.cpp
@@ -1,8 +1,6 @@
-#include "libFileArb/Compiler/IfMSVCIgnoreTheseWarningsGlobally.h"
-#include <functional>
-#include <memory>
-#include <string>
-#include <vector>
+#include "libFileArb/Compiler/IfMSVCIgnoreTheseWarningsGlobally.h" // IWYU pragma: keep
+#include <functional> // IWYU pragma: keep
+#include <memory> // IWYU pragma: keep
 using namespace std;
 #include "libFileArb/Components/FileArbProgram.h"
 

diff --git a/JenkinsJobs/Linux/FileArb-Debug-ClangIncludeWhatYouUse.sh b/JenkinsJobs/Linux/FileArb-Debug-ClangIncludeWhatYouUse.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+set -ev
+
+export CXX=clang++
+python -u /usr/local/bin/PyUtils/BuildAndInstallCPlusPlusStaticLibrary.py \
+   --solution-name=FileArb \
+   --cmake-build-type=Debug \
+   --cmake-definitions="-DIncludeWhatYouUseMode=ON" \
+   --tests-project-name=libFileArbTests \
+   --do-install=false
+
diff --git a/libFileArb/CMakeLists.txt b/libFileArb/CMakeLists.txt
@@ -34,10 +34,11 @@ source_group("" FILES ${Sources})
 
 add_library(libFileArb ${Sources})
 if(UNIX)
-   target_precompile_headers(libFileArb PRIVATE pch.h)
-   set_target_properties(libFileArb PROPERTIES DEBUG_OUTPUT_NAME "FileArbDebug")
-   set_target_properties(libFileArb PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "FileArbRelWithDebInfo")
-
+   if(NOT IncludeWhatYouUseMode)
+      target_precompile_headers(libFileArb PRIVATE pch.h)
+      set_target_properties(libFileArb PROPERTIES DEBUG_OUTPUT_NAME "FileArbDebug")
+      set_target_properties(libFileArb PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "FileArbRelWithDebInfo")
+   endif()
    set_target_properties(libFileArb PROPERTIES UNITY_BUILD ON)
    set_target_properties(libFileArb PROPERTIES UNITY_BUILD_BATCH_SIZE 8)
 elseif(MSVC)

diff --git a/libFileArbTests/CMakeLists.txt b/libFileArbTests/CMakeLists.txt
@@ -50,11 +50,12 @@ source_group("" FILES ${Sources})
 add_executable(libFileArbTests ${Sources})
 target_link_libraries(libFileArbTests libFileArb)
 if(UNIX)
-   target_precompile_headers(libFileArbTests PRIVATE pch.h)
+   if(NOT IncludeWhatYouUseMode)
+      target_precompile_headers(libFileArbTests PRIVATE pch.h)
+      set_target_properties(libFileArbTests PROPERTIES UNITY_BUILD ON)
+      set_target_properties(libFileArbTests PROPERTIES UNITY_BUILD_BATCH_SIZE 8)
+   endif()
    set_property(TARGET libFileArbTests PROPERTY LINKER_TYPE LLD)
-
-   set_target_properties(libFileArbTests PROPERTIES UNITY_BUILD ON)
-   set_target_properties(libFileArbTests PROPERTIES UNITY_BUILD_BATCH_SIZE 8)
 elseif(MSVC)
    IfMSVCEnablePrecompiledHeaders()
    IfMSVCAddRunTestsPostBuildStep()

diff --git a/libFileArbTests/Components/SubPrograms/CreateBinaryFilesSubProgramTests.cpp b/libFileArbTests/Components/SubPrograms/CreateBinaryFilesSubProgramTests.cpp
@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "libFileArb/Components/SubPrograms/CreateBinaryFilesSubProgram.h"
-#include "libFileArb/UtilityComponents/FileSystem/FileSystem.h"
 #include "libFileArbTests/Components/Makers/MetalMock/BinaryFileBytesMakerMock.h"
 #include "libFileArbTests/Components/Makers/MetalMock/FilePathsMakerMock.h"
 #include "libFileArbTests/Components/SubPrograms/MetalMock/FileCreatorMock.h"

diff --git a/libFileArbTests/Components/SubPrograms/CreateTextFilesSubProgramTests.cpp b/libFileArbTests/Components/SubPrograms/CreateTextFilesSubProgramTests.cpp
@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "libFileArb/Components/SubPrograms/CreateTextFilesSubProgram.h"
-#include "libFileArb/UtilityComponents/FileSystem/FileSystem.h"
 #include "libFileArbTests/Components/Makers/MetalMock/FilePathsMakerMock.h"
 #include "libFileArbTests/Components/Makers/MetalMock/TextFileTextMakerMock.h"
 #include "libFileArbTests/Components/SubPrograms/MetalMock/FileCreatorMock.h"

diff --git a/libFileArbTests/Components/SubPrograms/FileArbSubProgramTests.cpp b/libFileArbTests/Components/SubPrograms/FileArbSubProgramTests.cpp
@@ -1,8 +1,5 @@
 #include "pch.h"
 #include "libFileArb/Components/SubPrograms/FileArbSubProgram.h"
-#include "libFileArb/UtilityComponents/Console/Console.h"
-#include "libFileArb/UtilityComponents/FileSystem/FileSystem.h"
-#include "libFileArb/UtilityComponents/Time/StopwatchFactory.h"
 
 TESTS(FileArbSubProgramTests)
 AFACT(DefaultConstructor_NewsConsoleAndFileSystem)

diff --git a/libFileArbTests/Components/SubPrograms/FileCreatorTests.cpp b/libFileArbTests/Components/SubPrograms/FileCreatorTests.cpp
@@ -2,7 +2,6 @@
 #include "libFileArb/Components/SubPrograms/FileCreator.h"
 #include "libFileArbTests/Components/Makers/MetalMock/BinaryFileBytesMakerMock.h"
 #include "libFileArbTests/Components/Makers/MetalMock/TextFileTextMakerMock.h"
-#include "libFileArbTests/Components/SubPrograms/MetalMock/FileCreatorMock.h"
 #include "libFileArbTests/UtilityComponents/Console/MetalMock/ConsoleMock.h"
 #include "libFileArbTests/UtilityComponents/ForEachers/MetalMock/TwoArgMemberFunctionForEacherMock.h"
 #include "libFileArbTests/UtilityComponents/FileSystem/MetalMock/FileSystemMock.h"

diff --git a/libFileArbTests/UtilityComponents/FileSystem/FileSystemExceptionsTests.cpp b/libFileArbTests/UtilityComponents/FileSystem/FileSystemExceptionsTests.cpp
@@ -1,5 +1,4 @@
 #include "pch.h"
-#include "libFileArb/UtilityComponents/ErrorHandling/ErrorCodeTranslator.h"
 #include "libFileArb/UtilityComponents/FileSystem/FileSystemExceptions.h"
 
 TESTS(FileSystemExceptionsTests)