Use #include "third_party/..." consistently to include third party code

diff --git a/Makefile.in b/Makefile.in
index 360a894a80d0680c70040ee3d554ed60936179f2..225396dd08a962543e5e565250f5b4517d82cefc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@ LIBS = @LIBS@
 
 all_cflags = $(CFLAGS)
 all_cxxflags = $(CXXFLAGS)
-all_cppflags = @DEFS@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir)/src -I$(srcdir)/src/third_party -I$(builddir)/unittest $(CPPFLAGS)
+all_cppflags = @DEFS@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir)/src -I$(builddir)/unittest $(CPPFLAGS)
 extra_libs = @extra_libs@
 
 v_at_0 = yes

diff --git a/src/AtomicFile.cpp b/src/AtomicFile.cpp
index ab63e0b2ab3d257959127334b30dd588c56560f9..6661c022d6b6271a1868ea004e2c40c3a1d137c4 100644 (file)
--- a/src/AtomicFile.cpp
+++ b/src/AtomicFile.cpp
@@ -22,9 +22,10 @@
 #include "Util.hpp"
 #include "ccache.hpp"
 
+#include "third_party/fmt/core.h"
+
 #include <cassert>
 #include <cerrno>
-#include <fmt/core.h>
 #include <unistd.h>
 
 AtomicFile::AtomicFile(const std::string& path, Mode mode) : m_path(path)

diff --git a/src/CacheEntryReader.cpp b/src/CacheEntryReader.cpp
index 59da8562c1c1c1c9ee5d6d64dd8a2256cf2e87fe..2670ed13c210587a76146e064738150cb6d283b9 100644 (file)
--- a/src/CacheEntryReader.cpp
+++ b/src/CacheEntryReader.cpp
@@ -22,7 +22,7 @@
 #include "Error.hpp"
 #include "ccache.hpp"
 
-#include <fmt/core.h>
+#include "third_party/fmt/core.h"
 
 CacheEntryReader::CacheEntryReader(FILE* stream,
                                    const uint8_t expected_magic[4],

diff --git a/src/CacheFile.hpp b/src/CacheFile.hpp
index 04d4ba3ba72788718079e113b437f2d3661d6a53..bcf8bf2c6b25a079995c0d2440e5a9f8908e159f 100644 (file)
--- a/src/CacheFile.hpp
+++ b/src/CacheFile.hpp
@@ -20,9 +20,10 @@
 
 #include "Error.hpp"
 
+#include "third_party/fmt/core.h"
+
 #include <cerrno>
 #include <cstring>
-#include <fmt/core.h>
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>

diff --git a/src/Checksum.hpp b/src/Checksum.hpp
index adc0b0bada6ab216dcbe02d7629d3944b1124b3e..7ffee2c8a779f4f53e09d3cb14e2e22e4cb011e9 100644 (file)
--- a/src/Checksum.hpp
+++ b/src/Checksum.hpp
@@ -20,7 +20,7 @@
 
 #include "system.hpp"
 
-#include <third_party/xxhash.h>
+#include "third_party/xxhash.h"
 
 class Checksum
 {

diff --git a/src/Config.hpp b/src/Config.hpp
index a05ba4f0ba7863f9f9804e96158023a8ccd045a4..bf8dbfaa48c86f8965c3b3db4356baa394326b27 100644 (file)
--- a/src/Config.hpp
+++ b/src/Config.hpp
@@ -22,7 +22,8 @@
 
 #include "ccache.hpp"
 
-#include <fmt/core.h>
+#include "third_party/fmt/core.h"
+
 #include <functional>
 #include <limits>
 #include <string>

diff --git a/src/ProgressBar.cpp b/src/ProgressBar.cpp
index df430529c9f2b18e12952ed63cc11910e0213d5b..55db6a6bb9326e0c89dd6293de64581c279da4bf 100644 (file)
--- a/src/ProgressBar.cpp
+++ b/src/ProgressBar.cpp
@@ -18,8 +18,9 @@
 
 #include "ProgressBar.hpp"
 
+#include "third_party/fmt/core.h"
+
 #include <cstdio>
-#include <fmt/core.h>
 #include <unistd.h>
 
 #ifdef _WIN32

diff --git a/src/ccache.cpp b/src/ccache.cpp
index fc60c5e8ec9eaf4a0dbe8027016d401c7f9fb3a9..7b27aa5f1332ec7ee4871153c8b317e47cc0a724 100644 (file)
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -24,15 +24,6 @@
 #include "Util.hpp"
 #include "cleanup.hpp"
 #include "compopt.hpp"
-
-#include <fmt/core.h>
-#include <limits>
-
-#ifdef HAVE_GETOPT_LONG
-#  include <getopt.h>
-#else
-#  include "third_party/getopt_long.h"
-#endif
 #include "compress.hpp"
 #include "hash.hpp"
 #include "hashutil.hpp"
@@ -41,7 +32,16 @@
 #include "result.hpp"
 #include "unify.hpp"
 
+#include "third_party/fmt/core.h"
+
+#ifdef HAVE_GETOPT_LONG
+#  include <getopt.h>
+#else
+#  include "third_party/getopt_long.h"
+#endif
+
 #include <fstream>
+#include <limits>
 
 // Global variables used by other compilation units.
 extern char* primary_config_path;

diff --git a/src/compress.cpp b/src/compress.cpp
index 5704d3e86c95f329b63d735928900b275db44a02..240d7ed985425c89a477204c954aa2fab0cf2d20 100644 (file)
--- a/src/compress.cpp
+++ b/src/compress.cpp
@@ -28,7 +28,8 @@
 #include "manifest.hpp"
 #include "result.hpp"
 
-#include <fmt/core.h>
+#include "third_party/fmt/core.h"
+
 #include <string>
 #include <thread>
 

diff --git a/src/legacy_util.cpp b/src/legacy_util.cpp
index 1c5171c5004f9b874a9782b15279be6b121b40a1..37874cde8d3cc10fa8e59bd4088fc50ef23d7df6 100644 (file)
--- a/src/legacy_util.cpp
+++ b/src/legacy_util.cpp
@@ -22,7 +22,8 @@
 #include "Util.hpp"
 #include "ccache.hpp"
 
-#include <fmt/core.h>
+#include "third_party/fmt/core.h"
+
 #include <string>
 
 #ifdef HAVE_PWD_H

diff --git a/unittest/catch2_tests.cpp b/unittest/catch2_tests.cpp
index 9d3b33646144be294ec9c8f57f9c1ceb02fb5f05..e6743edb345535925158cb1a06d932ce4ae136ac 100644 (file)
--- a/unittest/catch2_tests.cpp
+++ b/unittest/catch2_tests.cpp
@@ -19,7 +19,7 @@
 #include "catch2_tests.hpp"
 
 #define CATCH_CONFIG_RUNNER
-#include <catch.hpp>
+#include "third_party/catch.hpp"
 
 int
 run_catch2_tests(int argc, char** argv)

diff --git a/unittest/test_AtomicFile.cpp b/unittest/test_AtomicFile.cpp
index a45f2f3be33e0009f3d69fed9b957dfd47f0c8a6..3e07e1955ffce8cd749a78cfeea9532dba211ea1 100644 (file)
--- a/unittest/test_AtomicFile.cpp
+++ b/unittest/test_AtomicFile.cpp
@@ -19,7 +19,7 @@
 #include "../src/AtomicFile.hpp"
 #include "../src/Util.hpp"
 
-#include <catch.hpp>
+#include "third_party/catch.hpp"
 
 using Catch::Equals;
 

diff --git a/unittest/test_Checksum.cpp b/unittest/test_Checksum.cpp
index 0c535936799a6a4cadc18296446143ee0ebbd450..9b107de41fbfe9dacdd265921b69428185fb8e55 100644 (file)
--- a/unittest/test_Checksum.cpp
+++ b/unittest/test_Checksum.cpp
@@ -18,7 +18,7 @@
 
 #include "../src/Checksum.hpp"
 
-#include <catch.hpp>
+#include "third_party/catch.hpp"
 
 TEST_CASE("Checksums")
 {

diff --git a/unittest/test_Compression.cpp b/unittest/test_Compression.cpp
index 97c2b0514c9f95a3a1f4475776e26b100e6b912b..e2ccf7085bc38a260d15dc9ee49374a4c64fedcb 100644 (file)
--- a/unittest/test_Compression.cpp
+++ b/unittest/test_Compression.cpp
@@ -18,7 +18,7 @@
 
 #include "../src/Compression.hpp"
 
-#include <catch.hpp>
+#include "third_party/catch.hpp"
 
 using Catch::Equals;
 

diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp
index f32ceabd6efb5db2d70622f74e9a25f87a884d6e..a956899f6f32c849984a54e32fc7eadd79985382 100644 (file)
--- a/unittest/test_Config.cpp
+++ b/unittest/test_Config.cpp
@@ -21,8 +21,9 @@
 #include "../src/Util.hpp"
 #include "../src/ccache.hpp"
 
-#include <catch.hpp>
-#include <fmt/core.h>
+#include "third_party/catch.hpp"
+#include "third_party/fmt/core.h"
+
 #include <limits>
 #include <string>
 #include <vector>

diff --git a/unittest/test_NullCompression.cpp b/unittest/test_NullCompression.cpp
index 43e0c19866d55467191c64f059bfe796e747f7f5..0d767545aab3ca452787417d599aa696f7714a9f 100644 (file)
--- a/unittest/test_NullCompression.cpp
+++ b/unittest/test_NullCompression.cpp
@@ -21,7 +21,7 @@
 #include "../src/Decompressor.hpp"
 #include "../src/File.hpp"
 
-#include <catch.hpp>
+#include "third_party/catch.hpp"
 
 using Catch::Equals;
 

diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp
index 9d55a826bd4dd1f7120b9210c5f5b038607e8522..eaec54f345c396b034c3ac325ccddf6a6e7fc5ff 100644 (file)
--- a/unittest/test_Util.cpp
+++ b/unittest/test_Util.cpp
@@ -18,7 +18,7 @@
 
 #include "../src/Util.hpp"
 
-#include <catch.hpp>
+#include "third_party/catch.hpp"
 
 using Catch::Equals;
 

diff --git a/unittest/test_ZstdCompression.cpp b/unittest/test_ZstdCompression.cpp
index d9973d92f48051f0230713ebe7fe385bb7bc2d35..b978b5f885a3affb65a54d361ac005273abaa8df 100644 (file)
--- a/unittest/test_ZstdCompression.cpp
+++ b/unittest/test_ZstdCompression.cpp
@@ -21,7 +21,7 @@
 #include "../src/Decompressor.hpp"
 #include "../src/File.hpp"
 
-#include <catch.hpp>
+#include "third_party/catch.hpp"
 
 using Catch::Equals;