From 2faa3f6c55d2288316419f3efb8a483904a295f2 Mon Sep 17 00:00:00 2001 From: Marc Chevrier Date: Mon, 4 May 2020 23:22:02 +0200 Subject: Refactoring: Third-parties public headers are under cm3p prefix Fixes: #20666 --- .clang-format | 10 ++-- CMakeLists.txt | 11 ++-- Help/dev/source.rst | 15 ++++++ Source/CPack/WiX/cmWIXPatchParser.cxx | 2 +- Source/CPack/cmCPackArchiveGenerator.cxx | 2 +- Source/CPack/cmCPackExternalGenerator.cxx | 6 +-- Source/CTest/cmCTestBZR.cxx | 4 +- Source/CTest/cmCTestCurl.h | 2 +- Source/CTest/cmCTestMultiProcessHandler.cxx | 8 +-- Source/CTest/cmCTestMultiProcessHandler.h | 3 +- Source/CTest/cmCTestResourceSpec.cxx | 6 +-- Source/CTest/cmCTestSubmitHandler.cxx | 6 +-- Source/CTest/cmProcess.cxx | 2 +- Source/CTest/cmProcess.h | 3 +- Source/cmAffinity.cxx | 2 +- Source/cmAlgorithms.h | 2 - Source/cmArchiveWrite.cxx | 4 +- Source/cmCTest.cxx | 6 +-- Source/cmConnection.cxx | 11 +++- Source/cmConnection.h | 2 +- Source/cmCryptoHash.cxx | 6 +-- Source/cmCurl.h | 2 +- Source/cmELF.cxx | 6 +-- Source/cmExprParserHelper.h | 2 +- Source/cmFileAPI.h | 6 +-- Source/cmFileAPICMakeFiles.cxx | 2 +- Source/cmFileAPICMakeFiles.h | 2 +- Source/cmFileAPICache.cxx | 2 +- Source/cmFileAPICache.h | 2 +- Source/cmFileAPICodemodel.cxx | 2 +- Source/cmFileAPICodemodel.h | 2 +- Source/cmFileCommand.cxx | 5 +- Source/cmFileMonitor.h | 2 +- Source/cmFindPackageCommand.h | 2 +- Source/cmGeneratedFileStream.cxx | 3 +- Source/cmGetPipes.cxx | 3 +- Source/cmGlobalGenerator.cxx | 4 +- Source/cmGlobalGenerator.h | 2 +- Source/cmGlobalNinjaGenerator.cxx | 8 +-- Source/cmGlobalVisualStudio10Generator.cxx | 4 +- Source/cmJsonObjects.h | 2 +- Source/cmLocalGenerator.h | 2 +- Source/cmLocalVisualStudio10Generator.cxx | 2 +- Source/cmLocalVisualStudio7Generator.cxx | 3 +- Source/cmMakefile.cxx | 5 +- Source/cmMakefileProfilingData.cxx | 6 +-- Source/cmMathCommand.cxx | 2 +- Source/cmNinjaTargetGenerator.cxx | 4 +- Source/cmNinjaTargetGenerator.h | 2 +- Source/cmPipeConnection.h | 2 +- Source/cmQtAutoGenInitializer.cxx | 6 +-- Source/cmQtAutoGenerator.cxx | 4 +- Source/cmQtAutoGenerator.h | 2 +- Source/cmQtAutoMocUic.cxx | 4 +- Source/cmServer.cxx | 7 +-- Source/cmServer.h | 4 +- Source/cmServerConnection.cxx | 2 +- Source/cmServerProtocol.cxx | 2 +- Source/cmServerProtocol.h | 2 +- Source/cmStandardLexer.h | 2 +- Source/cmSystemTools.cxx | 5 +- Source/cmUVHandlePtr.cxx | 2 +- Source/cmUVHandlePtr.h | 2 +- Source/cmUVProcessChain.cxx | 2 +- Source/cmUVProcessChain.h | 2 +- Source/cmUVSignalHackRAII.h | 2 +- Source/cmUVStreambuf.h | 2 +- Source/cmVSSetupHelper.h | 3 +- Source/cmVersion.h | 2 +- Source/cmWorkerPool.cxx | 2 +- Source/cmXMLParser.cxx | 4 +- Source/cmake.cxx | 2 +- Source/cmake.h | 2 +- Source/cmakemain.cxx | 6 ++- Source/cmcmd.cxx | 3 +- Tests/CMakeLib/testUVProcessChain.cxx | 2 +- Tests/CMakeLib/testUVRAII.cxx | 2 +- Tests/CMakeLib/testUVStreambuf.cxx | 3 +- Tests/CPackWiXGenerator/myotherapp.cpp | 2 +- .../CommandLine/cmake_depends/test_UTF-16LE.h | Bin 58 -> 59 bytes .../VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp | 2 +- Utilities/IWYU/mapping.imp | 59 ++++----------------- Utilities/cm3p/Setup.Configuration.h | 8 +++ Utilities/cm3p/archive.h | 14 +++++ Utilities/cm3p/archive_entry.h | 14 +++++ Utilities/cm3p/bzlib.h | 14 +++++ Utilities/cm3p/curl/curl.h | 14 +++++ Utilities/cm3p/expat.h | 14 +++++ Utilities/cm3p/json/reader.h | 14 +++++ Utilities/cm3p/json/value.h | 14 +++++ Utilities/cm3p/json/writer.h | 14 +++++ Utilities/cm3p/kwiml/abi.h | 14 +++++ Utilities/cm3p/kwiml/int.h | 14 +++++ Utilities/cm3p/lzma.h | 14 +++++ Utilities/cm3p/rhash.h | 14 +++++ Utilities/cm3p/uv.h | 14 +++++ Utilities/cm3p/zlib.h | 14 +++++ Utilities/cm3p/zstd.h | 14 +++++ Utilities/cm_bzlib.h | 14 ----- Utilities/cm_curl.h | 14 ----- Utilities/cm_expat.h | 14 ----- Utilities/cm_jsoncpp_reader.h | 14 ----- Utilities/cm_jsoncpp_value.h | 14 ----- Utilities/cm_jsoncpp_writer.h | 14 ----- Utilities/cm_kwiml.h | 16 ------ Utilities/cm_libarchive.h | 16 ------ Utilities/cm_lzma.h | 14 ----- Utilities/cm_rhash.h | 14 ----- Utilities/cm_uv.h | 14 ----- Utilities/cm_zlib.h | 14 ----- Utilities/cm_zstd.h | 14 ----- Utilities/cmexpat/lib/siphash.h | 2 +- .../libarchive/archive_read_support_filter_bzip2.c | 2 +- .../libarchive/archive_read_support_filter_gzip.c | 2 +- .../libarchive/archive_read_support_filter_lzop.c | 2 +- .../libarchive/archive_read_support_filter_xz.c | 2 +- .../libarchive/archive_read_support_filter_zstd.c | 2 +- .../libarchive/archive_read_support_format_7zip.c | 6 +-- .../libarchive/archive_read_support_format_cab.c | 2 +- .../archive_read_support_format_iso9660.c | 2 +- .../libarchive/archive_read_support_format_rar.c | 2 +- .../libarchive/archive_read_support_format_rar5.c | 2 +- .../libarchive/archive_read_support_format_xar.c | 6 +-- .../libarchive/archive_read_support_format_zip.c | 2 +- Utilities/cmlibarchive/libarchive/archive_util.c | 6 +-- .../libarchive/archive_version_details.c | 8 +-- .../libarchive/archive_write_add_filter_bzip2.c | 2 +- .../libarchive/archive_write_add_filter_gzip.c | 2 +- .../libarchive/archive_write_add_filter_xz.c | 2 +- .../libarchive/archive_write_add_filter_zstd.c | 2 +- .../libarchive/archive_write_disk_posix.c | 2 +- .../libarchive/archive_write_set_format_7zip.c | 6 +-- .../libarchive/archive_write_set_format_iso9660.c | 2 +- .../libarchive/archive_write_set_format_xar.c | 6 +-- .../libarchive/archive_write_set_format_zip.c | 2 +- Utilities/cmlibrhash/librhash/byte_order.h | 2 +- Utilities/cmlibrhash/librhash/ustd.h | 2 +- Utilities/cmnghttp2/cmakeconfig.h.in | 3 +- Utilities/cmzlib/CMakeLists.txt | 5 -- Utilities/std/cm/bits/string_view.cxx | 2 +- Utilities/std/cm/shared_mutex | 2 +- 141 files changed, 430 insertions(+), 414 deletions(-) create mode 100644 Utilities/cm3p/Setup.Configuration.h create mode 100644 Utilities/cm3p/archive.h create mode 100644 Utilities/cm3p/archive_entry.h create mode 100644 Utilities/cm3p/bzlib.h create mode 100644 Utilities/cm3p/curl/curl.h create mode 100644 Utilities/cm3p/expat.h create mode 100644 Utilities/cm3p/json/reader.h create mode 100644 Utilities/cm3p/json/value.h create mode 100644 Utilities/cm3p/json/writer.h create mode 100644 Utilities/cm3p/kwiml/abi.h create mode 100644 Utilities/cm3p/kwiml/int.h create mode 100644 Utilities/cm3p/lzma.h create mode 100644 Utilities/cm3p/rhash.h create mode 100644 Utilities/cm3p/uv.h create mode 100644 Utilities/cm3p/zlib.h create mode 100644 Utilities/cm3p/zstd.h delete mode 100644 Utilities/cm_bzlib.h delete mode 100644 Utilities/cm_curl.h delete mode 100644 Utilities/cm_expat.h delete mode 100644 Utilities/cm_jsoncpp_reader.h delete mode 100644 Utilities/cm_jsoncpp_value.h delete mode 100644 Utilities/cm_jsoncpp_writer.h delete mode 100644 Utilities/cm_kwiml.h delete mode 100644 Utilities/cm_libarchive.h delete mode 100644 Utilities/cm_lzma.h delete mode 100644 Utilities/cm_rhash.h delete mode 100644 Utilities/cm_uv.h delete mode 100644 Utilities/cm_zlib.h delete mode 100644 Utilities/cm_zstd.h diff --git a/.clang-format b/.clang-format index 4bfce44..8c015ef 100644 --- a/.clang-format +++ b/.clang-format @@ -32,16 +32,18 @@ IncludeCategories: Priority: 5 - Regex: '^(<|")Qt?[A-Z]' Priority: 6 - - Regex: '^(<|")cmsys/' + - Regex: '^``). These wrappers are located under +``Utilities/cm3p`` directory. + Source Tree Layout ================== @@ -208,6 +220,9 @@ The CMake source tree is organized as follows. * ``Utilities/std/cmext``: Extensions to the C++ STL. + * ``Utilities/cm3p``: + Public headers for third parties needed to build CMake. + * ``Utilities/Sphinx/``: Sphinx configuration to build CMake user documentation. diff --git a/Source/CPack/WiX/cmWIXPatchParser.cxx b/Source/CPack/WiX/cmWIXPatchParser.cxx index 5588d2d..8b26c4e 100644 --- a/Source/CPack/WiX/cmWIXPatchParser.cxx +++ b/Source/CPack/WiX/cmWIXPatchParser.cxx @@ -6,7 +6,7 @@ #include -#include "cm_expat.h" +#include #include "cmCPackGenerator.h" diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index aaa5318..967cc60 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -8,7 +8,7 @@ #include #include -#include "cm_libarchive.h" +#include #include "cmCPackComponentGroup.h" #include "cmCPackGenerator.h" diff --git a/Source/CPack/cmCPackExternalGenerator.cxx b/Source/CPack/cmCPackExternalGenerator.cxx index 142eb6f..11e1aec 100644 --- a/Source/CPack/cmCPackExternalGenerator.cxx +++ b/Source/CPack/cmCPackExternalGenerator.cxx @@ -8,10 +8,10 @@ #include -#include "cmsys/FStream.hxx" +#include +#include -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" +#include "cmsys/FStream.hxx" #include "cmCPackComponentGroup.h" #include "cmCPackLog.h" diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index c87fb83b..c533cd7 100644 --- a/Source/CTest/cmCTestBZR.cxx +++ b/Source/CTest/cmCTestBZR.cxx @@ -10,9 +10,9 @@ #include -#include "cmsys/RegularExpression.hxx" +#include -#include "cm_expat.h" +#include "cmsys/RegularExpression.hxx" #include "cmCTest.h" #include "cmCTestVC.h" diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h index 9c5ba66..b0d7f07 100644 --- a/Source/CTest/cmCTestCurl.h +++ b/Source/CTest/cmCTestCurl.h @@ -8,7 +8,7 @@ #include #include -#include "cm_curl.h" +#include class cmCTest; diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index b7251d9..a08cb34 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -21,13 +21,13 @@ #include #include +#include +#include +#include + #include "cmsys/FStream.hxx" #include "cmsys/SystemInformation.hxx" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" -#include "cm_uv.h" - #include "cmAffinity.h" #include "cmCTest.h" #include "cmCTestBinPacker.h" diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h index 6e999f9..e21b912 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.h +++ b/Source/CTest/cmCTestMultiProcessHandler.h @@ -11,10 +11,9 @@ #include #include +#include #include -#include "cm_uv.h" - #include "cmCTest.h" #include "cmCTestResourceAllocator.h" #include "cmCTestTestHandler.h" diff --git a/Source/CTest/cmCTestResourceSpec.cxx b/Source/CTest/cmCTestResourceSpec.cxx index 8f91efb..21c97de 100644 --- a/Source/CTest/cmCTestResourceSpec.cxx +++ b/Source/CTest/cmCTestResourceSpec.cxx @@ -7,12 +7,12 @@ #include #include +#include +#include + #include "cmsys/FStream.hxx" #include "cmsys/RegularExpression.hxx" -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_value.h" - static const cmsys::RegularExpression IdentifierRegex{ "^[a-z_][a-z0-9_]*$" }; static const cmsys::RegularExpression IdRegex{ "^[a-z0-9_]+$" }; diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 811a7e8..2989025 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -9,9 +9,9 @@ #include -#include "cm_curl.h" -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_value.h" +#include +#include +#include #include "cmAlgorithms.h" #include "cmCTest.h" diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 2742fd7..a549117 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -17,7 +17,7 @@ #include "cmGetPipes.h" #include "cmStringAlgorithms.h" #if defined(_WIN32) -# include "cm_kwiml.h" +# include #endif #define CM_PROCESS_BUF_SIZE 65536 diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h index 526c920..1e6578c 100644 --- a/Source/CTest/cmProcess.h +++ b/Source/CTest/cmProcess.h @@ -11,11 +11,10 @@ #include #include +#include #include #include -#include "cm_uv.h" - #include "cmDuration.h" #include "cmProcessOutput.h" #include "cmUVHandlePtr.h" diff --git a/Source/cmAffinity.cxx b/Source/cmAffinity.cxx index 8f9fe2a..35443e7 100644 --- a/Source/cmAffinity.cxx +++ b/Source/cmAffinity.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmAffinity.h" -#include "cm_uv.h" +#include #ifndef CMAKE_USE_SYSTEM_LIBUV # ifdef _WIN32 diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index 8b0aa5e..c8e8dcb 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -15,8 +15,6 @@ #include -#include "cm_kwiml.h" - #include "cmRange.h" template diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index 0f9b42c..78bb6e0 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -7,12 +7,14 @@ #include #include +#include +#include + #include "cmsys/Directory.hxx" #include "cmsys/Encoding.hxx" #include "cmsys/FStream.hxx" #include "cm_get_date.h" -#include "cm_libarchive.h" #include "cmLocale.h" #include "cmStringAlgorithms.h" diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 2a0ddba1..9b023d9 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -21,6 +21,9 @@ #include #include +#include +#include + #include "cmsys/Base64.h" #include "cmsys/Directory.hxx" #include "cmsys/FStream.hxx" @@ -28,9 +31,6 @@ #include "cmsys/Process.h" #include "cmsys/RegularExpression.hxx" #include "cmsys/SystemInformation.hxx" - -#include "cm_curl.h" -#include "cm_zlib.h" #if defined(_WIN32) # include // IWYU pragma: keep #else diff --git a/Source/cmConnection.cxx b/Source/cmConnection.cxx index 884e314..e4d0cf1 100644 --- a/Source/cmConnection.cxx +++ b/Source/cmConnection.cxx @@ -5,7 +5,7 @@ #include #include -#include "cm_uv.h" +#include #include "cmServer.h" @@ -20,8 +20,13 @@ void cmEventBasedConnection::on_alloc_buffer(uv_handle_t* handle, uv_buf_t* buf) { (void)(handle); +#ifndef __clang_analyzer__ char* rawBuffer = new char[suggested_size]; *buf = uv_buf_init(rawBuffer, static_cast(suggested_size)); +#else + (void)(suggested_size); + (void)(buf); +#endif /* __clang_analyzer__ */ } void cmEventBasedConnection::on_read(uv_stream_t* stream, ssize_t nread, @@ -76,6 +81,7 @@ void cmEventBasedConnection::WriteData(const std::string& _data) assert(uv_thread_equal(&curr_thread_id, &this->Server->ServeThreadId)); #endif +#ifndef __clang_analyzer__ auto data = _data; assert(this->WriteStream.get()); if (BufferStrategy) { @@ -90,6 +96,9 @@ void cmEventBasedConnection::WriteData(const std::string& _data) memcpy(req->buf.base, data.c_str(), ds); uv_write(reinterpret_cast(req), this->WriteStream, &req->buf, 1, on_write); +#else + (void)(_data); +#endif /* __clang_analyzer__ */ } void cmEventBasedConnection::ReadData(const std::string& data) diff --git a/Source/cmConnection.h b/Source/cmConnection.h index 7bb2494..5335a7f 100644 --- a/Source/cmConnection.h +++ b/Source/cmConnection.h @@ -9,7 +9,7 @@ #include #include -#include "cm_uv.h" +#include #include "cmUVHandlePtr.h" diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx index dc7d939..b1e63ba 100644 --- a/Source/cmCryptoHash.cxx +++ b/Source/cmCryptoHash.cxx @@ -4,10 +4,10 @@ #include -#include "cmsys/FStream.hxx" +#include +#include -#include "cm_kwiml.h" -#include "cm_rhash.h" +#include "cmsys/FStream.hxx" static unsigned int const cmCryptoHashAlgoToId[] = { /* clang-format needs this comment to break after the opening brace */ diff --git a/Source/cmCurl.h b/Source/cmCurl.h index cb73ce6..7bd036e 100644 --- a/Source/cmCurl.h +++ b/Source/cmCurl.h @@ -7,7 +7,7 @@ #include -#include "cm_curl.h" +#include std::string cmCurlSetCAInfo(::CURL* curl, const char* cafile = nullptr); std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level, diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 202b205..a8d81f7 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -3,6 +3,7 @@ #include "cmELF.h" #include +#include #include #include #include @@ -12,14 +13,13 @@ #include #include -#include "cmsys/FStream.hxx" +#include -#include "cm_kwiml.h" +#include "cmsys/FStream.hxx" // Include the ELF format information system header. #if defined(__OpenBSD__) # include -# include #elif defined(__HAIKU__) # include # include diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h index eaf5dc7..717acdc 100644 --- a/Source/cmExprParserHelper.h +++ b/Source/cmExprParserHelper.h @@ -8,7 +8,7 @@ #include #include -#include "cm_kwiml.h" +#include class cmExprParserHelper { diff --git a/Source/cmFileAPI.h b/Source/cmFileAPI.h index e183e0d..ae07612 100644 --- a/Source/cmFileAPI.h +++ b/Source/cmFileAPI.h @@ -11,9 +11,9 @@ #include #include -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" +#include +#include +#include class cmake; diff --git a/Source/cmFileAPICMakeFiles.cxx b/Source/cmFileAPICMakeFiles.cxx index 44ba96c..1e4f3b6 100644 --- a/Source/cmFileAPICMakeFiles.cxx +++ b/Source/cmFileAPICMakeFiles.cxx @@ -6,7 +6,7 @@ #include #include -#include "cm_jsoncpp_value.h" +#include #include "cmFileAPI.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmFileAPICMakeFiles.h b/Source/cmFileAPICMakeFiles.h index a851c32..1ae1e4f 100644 --- a/Source/cmFileAPICMakeFiles.h +++ b/Source/cmFileAPICMakeFiles.h @@ -5,7 +5,7 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_jsoncpp_value.h" +#include class cmFileAPI; diff --git a/Source/cmFileAPICache.cxx b/Source/cmFileAPICache.cxx index 5d2ddf9..25e5916 100644 --- a/Source/cmFileAPICache.cxx +++ b/Source/cmFileAPICache.cxx @@ -7,7 +7,7 @@ #include #include -#include "cm_jsoncpp_value.h" +#include #include "cmFileAPI.h" #include "cmState.h" diff --git a/Source/cmFileAPICache.h b/Source/cmFileAPICache.h index 09d9e1c..2f30c76 100644 --- a/Source/cmFileAPICache.h +++ b/Source/cmFileAPICache.h @@ -5,7 +5,7 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_jsoncpp_value.h" +#include class cmFileAPI; diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx index f34d7d5..b983b21 100644 --- a/Source/cmFileAPICodemodel.cxx +++ b/Source/cmFileAPICodemodel.cxx @@ -17,7 +17,7 @@ #include -#include "cm_jsoncpp_value.h" +#include #include "cmCryptoHash.h" #include "cmFileAPI.h" diff --git a/Source/cmFileAPICodemodel.h b/Source/cmFileAPICodemodel.h index ffbd928..a6c6bdd 100644 --- a/Source/cmFileAPICodemodel.h +++ b/Source/cmFileAPICodemodel.h @@ -5,7 +5,7 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_jsoncpp_value.h" +#include class cmFileAPI; diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 161bbe8..f3d49c3 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -19,11 +19,12 @@ #include #include +#include + #include "cmsys/FStream.hxx" #include "cmsys/Glob.hxx" #include "cmsys/RegularExpression.hxx" -#include "cm_kwiml.h" #include "cm_sys_stat.h" #include "cmAlgorithms.h" @@ -54,7 +55,7 @@ #include "cmake.h" #if !defined(CMAKE_BOOTSTRAP) -# include "cm_curl.h" +# include # include "cmCurl.h" # include "cmFileLockResult.h" diff --git a/Source/cmFileMonitor.h b/Source/cmFileMonitor.h index b510a2c..fc75b0c 100644 --- a/Source/cmFileMonitor.h +++ b/Source/cmFileMonitor.h @@ -9,7 +9,7 @@ #include #include -#include "cm_uv.h" +#include class cmRootWatcher; diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index ae9ade7..7058a54 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -12,7 +12,7 @@ #include #include -#include "cm_kwiml.h" +#include #include "cmFindCommon.h" #include "cmPolicies.h" diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx index f76e205..9cee0e6 100644 --- a/Source/cmGeneratedFileStream.cxx +++ b/Source/cmGeneratedFileStream.cxx @@ -8,8 +8,9 @@ #include "cmSystemTools.h" #if !defined(CMAKE_BOOTSTRAP) +# include + # include "cm_codecvt.hxx" -# include "cm_zlib.h" #endif cmGeneratedFileStream::cmGeneratedFileStream(Encoding encoding) diff --git a/Source/cmGetPipes.cxx b/Source/cmGetPipes.cxx index 4eda1c5..a5b6469 100644 --- a/Source/cmGetPipes.cxx +++ b/Source/cmGetPipes.cxx @@ -2,10 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGetPipes.h" +#include #include -#include "cm_uv.h" - #if defined(_WIN32) && !defined(__CYGWIN__) # include diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index de6a649..6370ed2 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -52,8 +52,8 @@ #include "cmake.h" #if !defined(CMAKE_BOOTSTRAP) -# include "cm_jsoncpp_value.h" -# include "cm_jsoncpp_writer.h" +# include +# include # include "cmCryptoHash.h" # include "cmQtAutoGenGlobalInitializer.h" diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index a76ab3c..dcd5a66 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -28,7 +28,7 @@ #include "cmTargetDepend.h" #if !defined(CMAKE_BOOTSTRAP) -# include "cm_jsoncpp_value.h" +# include # include "cmFileLockPool.h" #endif diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 8ef19cc..843b0f4 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -12,11 +12,11 @@ #include #include -#include "cmsys/FStream.hxx" +#include +#include +#include -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" +#include "cmsys/FStream.hxx" #include "cmDocumentationEntry.h" #include "cmFortranParser.h" diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 5166de6..5dac072 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -6,12 +6,12 @@ #include +#include + #include "cmsys/FStream.hxx" #include "cmsys/Glob.hxx" #include "cmsys/RegularExpression.hxx" -#include "cm_jsoncpp_reader.h" - #include "cmAlgorithms.h" #include "cmDocumentationEntry.h" #include "cmGeneratorTarget.h" diff --git a/Source/cmJsonObjects.h b/Source/cmJsonObjects.h index 64291cc..2fd4b26 100644 --- a/Source/cmJsonObjects.h +++ b/Source/cmJsonObjects.h @@ -8,7 +8,7 @@ #include #include -#include "cm_jsoncpp_value.h" +#include class cmake; class cmGlobalGenerator; diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 1492304..9beae61 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -13,7 +13,7 @@ #include #include -#include "cm_kwiml.h" +#include #include "cmCustomCommandTypes.h" #include "cmListFileCache.h" diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index 02e2c6d..9076e26 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -4,7 +4,7 @@ #include -#include "cm_expat.h" +#include #include "cmAlgorithms.h" #include "cmGeneratorTarget.h" diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index e18fac3..0b02724 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -7,10 +7,9 @@ #include +#include #include // for isspace -#include "cm_expat.h" - #include "cmComputeLinkInformation.h" #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6c46353..58883b5 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -20,11 +20,12 @@ #include #include +#include +#include + #include "cmsys/FStream.hxx" #include "cmsys/RegularExpression.hxx" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" #include "cm_sys_stat.h" #include "cmCommandArgumentParserHelper.h" diff --git a/Source/cmMakefileProfilingData.cxx b/Source/cmMakefileProfilingData.cxx index adf4eee..e0150dc 100644 --- a/Source/cmMakefileProfilingData.cxx +++ b/Source/cmMakefileProfilingData.cxx @@ -6,12 +6,12 @@ #include #include +#include +#include + #include "cmsys/FStream.hxx" #include "cmsys/SystemInformation.hxx" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" - #include "cmListFileCache.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" diff --git a/Source/cmMathCommand.cxx b/Source/cmMathCommand.cxx index f11b906..56221bf 100644 --- a/Source/cmMathCommand.cxx +++ b/Source/cmMathCommand.cxx @@ -4,7 +4,7 @@ #include -#include "cm_kwiml.h" +#include #include "cmExecutionStatus.h" #include "cmExprParserHelper.h" diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 0606484..efd2fd5 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -14,8 +14,8 @@ #include #include -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" +#include +#include #include "cmComputeLinkInformation.h" #include "cmCustomCommandGenerator.h" diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index 8678dc3..1ac5683 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -12,7 +12,7 @@ #include #include -#include "cm_jsoncpp_value.h" +#include #include "cmCommonTargetGenerator.h" #include "cmGlobalNinjaGenerator.h" diff --git a/Source/cmPipeConnection.h b/Source/cmPipeConnection.h index 81f8a49..1215716 100644 --- a/Source/cmPipeConnection.h +++ b/Source/cmPipeConnection.h @@ -6,7 +6,7 @@ #include -#include "cm_uv.h" +#include #include "cmConnection.h" #include "cmUVHandlePtr.h" diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 235ee38..003a300 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -18,10 +18,10 @@ #include #include -#include "cmsys/SystemInformation.hxx" +#include +#include -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" +#include "cmsys/SystemInformation.hxx" #include "cmCustomCommand.h" #include "cmCustomCommandLines.h" diff --git a/Source/cmQtAutoGenerator.cxx b/Source/cmQtAutoGenerator.cxx index da96305..ee2bc09 100644 --- a/Source/cmQtAutoGenerator.cxx +++ b/Source/cmQtAutoGenerator.cxx @@ -2,9 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmQtAutoGenerator.h" -#include "cmsys/FStream.hxx" +#include -#include "cm_jsoncpp_reader.h" +#include "cmsys/FStream.hxx" #include "cmQtAutoGen.h" #include "cmStringAlgorithms.h" diff --git a/Source/cmQtAutoGenerator.h b/Source/cmQtAutoGenerator.h index bbe6dd0..83fb3ed 100644 --- a/Source/cmQtAutoGenerator.h +++ b/Source/cmQtAutoGenerator.h @@ -13,7 +13,7 @@ #include -#include "cm_jsoncpp_value.h" +#include #include "cmFileTime.h" #include "cmQtAutoGen.h" diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 36dd627..9adcabb 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -18,11 +18,11 @@ #include #include +#include + #include "cmsys/FStream.hxx" #include "cmsys/RegularExpression.hxx" -#include "cm_jsoncpp_value.h" - #include "cmCryptoHash.h" #include "cmFileTime.h" #include "cmGccDepfileReader.h" diff --git a/Source/cmServer.cxx b/Source/cmServer.cxx index 434fb68..7f97406 100644 --- a/Source/cmServer.cxx +++ b/Source/cmServer.cxx @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -12,10 +13,10 @@ #include #include -#include "cmsys/FStream.hxx" +#include +#include -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_writer.h" +#include "cmsys/FStream.hxx" #include "cmConnection.h" #include "cmFileMonitor.h" diff --git a/Source/cmServer.h b/Source/cmServer.h index ec40738..9543329 100644 --- a/Source/cmServer.h +++ b/Source/cmServer.h @@ -10,8 +10,8 @@ #include -#include "cm_jsoncpp_value.h" -#include "cm_uv.h" +#include +#include #include "cmUVHandlePtr.h" diff --git a/Source/cmServerConnection.cxx b/Source/cmServerConnection.cxx index 2791972..b4f41a0 100644 --- a/Source/cmServerConnection.cxx +++ b/Source/cmServerConnection.cxx @@ -4,7 +4,7 @@ #include "cmServerConnection.h" -#include "cm_uv.h" +#include #include "cmServer.h" #include "cmServerDictionary.h" diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index f6154eb..6b32de3 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -12,7 +12,7 @@ #include #include -#include "cm_uv.h" +#include #include "cmExternalMakefileProjectGenerator.h" #include "cmFileMonitor.h" diff --git a/Source/cmServerProtocol.h b/Source/cmServerProtocol.h index 8446c3e..c71b7bf 100644 --- a/Source/cmServerProtocol.h +++ b/Source/cmServerProtocol.h @@ -8,7 +8,7 @@ #include #include -#include "cm_jsoncpp_value.h" +#include #include "cmake.h" diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h index 55d23c1..cc67ac2 100644 --- a/Source/cmStandardLexer.h +++ b/Source/cmStandardLexer.h @@ -63,7 +63,7 @@ #define YY_NO_UNPUT 1 #define ECHO -#include "cm_kwiml.h" +#include typedef KWIML_INT_int8_t flex_int8_t; typedef KWIML_INT_uint8_t flex_uint8_t; typedef KWIML_INT_int16_t flex_int16_t; diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 23b099a..be799b0 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -14,7 +14,7 @@ #include -#include "cm_uv.h" +#include #include "cmDuration.h" #include "cmProcessOutput.h" @@ -22,7 +22,8 @@ #include "cmStringAlgorithms.h" #if !defined(CMAKE_BOOTSTRAP) -# include "cm_libarchive.h" +# include +# include # include "cmArchiveWrite.h" # include "cmLocale.h" diff --git a/Source/cmUVHandlePtr.cxx b/Source/cmUVHandlePtr.cxx index 23dabb7..df2f64e 100644 --- a/Source/cmUVHandlePtr.cxx +++ b/Source/cmUVHandlePtr.cxx @@ -7,7 +7,7 @@ #include #include -#include "cm_uv.h" +#include namespace cm { diff --git a/Source/cmUVHandlePtr.h b/Source/cmUVHandlePtr.h index 3083b60..d9de7f3 100644 --- a/Source/cmUVHandlePtr.h +++ b/Source/cmUVHandlePtr.h @@ -8,7 +8,7 @@ #include #include -#include "cm_uv.h" +#include #if defined(__SUNPRO_CC) diff --git a/Source/cmUVProcessChain.cxx b/Source/cmUVProcessChain.cxx index 543c330..6040fd8 100644 --- a/Source/cmUVProcessChain.cxx +++ b/Source/cmUVProcessChain.cxx @@ -9,7 +9,7 @@ #include -#include "cm_uv.h" +#include #include "cmGetPipes.h" #include "cmUVHandlePtr.h" diff --git a/Source/cmUVProcessChain.h b/Source/cmUVProcessChain.h index cd7397e..b5ccb19 100644 --- a/Source/cmUVProcessChain.h +++ b/Source/cmUVProcessChain.h @@ -11,7 +11,7 @@ #include #include -#include "cm_uv.h" +#include class cmUVProcessChain; diff --git a/Source/cmUVSignalHackRAII.h b/Source/cmUVSignalHackRAII.h index 63599db..60e4ca8 100644 --- a/Source/cmUVSignalHackRAII.h +++ b/Source/cmUVSignalHackRAII.h @@ -3,7 +3,7 @@ #pragma once #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_uv.h" +#include #if defined(CMAKE_USE_SYSTEM_LIBUV) && !defined(_WIN32) && \ UV_VERSION_MAJOR == 1 && UV_VERSION_MINOR < 19 diff --git a/Source/cmUVStreambuf.h b/Source/cmUVStreambuf.h index 1c8a771..50faede 100644 --- a/Source/cmUVStreambuf.h +++ b/Source/cmUVStreambuf.h @@ -8,7 +8,7 @@ #include #include -#include "cm_uv.h" +#include #include "cmUVHandlePtr.h" diff --git a/Source/cmVSSetupHelper.h b/Source/cmVSSetupHelper.h index 0980cef..a2fd3d5 100644 --- a/Source/cmVSSetupHelper.h +++ b/Source/cmVSSetupHelper.h @@ -8,13 +8,12 @@ #endif // Published by Visual Studio Setup team +#include #include #include #include -#include "cmvssetup/Setup.Configuration.h" - template class SmartCOMPtr { diff --git a/Source/cmVersion.h b/Source/cmVersion.h index bfd994d..932ef04 100644 --- a/Source/cmVersion.h +++ b/Source/cmVersion.h @@ -3,7 +3,7 @@ #ifndef cmVersion_h #define cmVersion_h -#include "cm_kwiml.h" +#include /** \class cmVersion * \brief Helper class for providing CMake and CTest version information. diff --git a/Source/cmWorkerPool.cxx b/Source/cmWorkerPool.cxx index aa0d6b3..9fec936 100644 --- a/Source/cmWorkerPool.cxx +++ b/Source/cmWorkerPool.cxx @@ -13,7 +13,7 @@ #include -#include "cm_uv.h" +#include #include "cmRange.h" #include "cmStringAlgorithms.h" diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx index ad5c4ba..24da8c6 100644 --- a/Source/cmXMLParser.cxx +++ b/Source/cmXMLParser.cxx @@ -7,9 +7,9 @@ #include #include -#include "cmsys/FStream.hxx" +#include -#include "cm_expat.h" +#include "cmsys/FStream.hxx" cmXMLParser::cmXMLParser() { diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 057d54d..cd9ba2c 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -57,7 +57,7 @@ #if !defined(CMAKE_BOOTSTRAP) # include -# include "cm_jsoncpp_writer.h" +# include # include "cmFileAPI.h" # include "cmGraphVizWriter.h" diff --git a/Source/cmake.h b/Source/cmake.h index cfcd264..cd152cb 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -27,7 +27,7 @@ #include "cmStateTypes.h" #if !defined(CMAKE_BOOTSTRAP) -# include "cm_jsoncpp_value.h" +# include #endif class cmExternalMakefileProjectGeneratorFactory; diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 2828116..b12990b 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -1,6 +1,8 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ +#include "cmConfigure.h" // IWYU pragma: keep + #include #include #include @@ -11,6 +13,8 @@ #include +#include + #include "cmDocumentationEntry.h" // IWYU pragma: keep #include "cmGlobalGenerator.h" #include "cmMakefile.h" @@ -27,8 +31,6 @@ #endif #include "cmsys/Encoding.hxx" - -#include "cm_uv.h" #if defined(_WIN32) && !defined(CMAKE_BOOTSTRAP) # include "cmsys/ConsoleBuf.hxx" #endif diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index a8e07e4..de76d73 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -4,10 +4,9 @@ #include +#include #include -#include "cm_uv.h" - #include "cmDuration.h" #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" diff --git a/Tests/CMakeLib/testUVProcessChain.cxx b/Tests/CMakeLib/testUVProcessChain.cxx index 71a1764..61a77cf 100644 --- a/Tests/CMakeLib/testUVProcessChain.cxx +++ b/Tests/CMakeLib/testUVProcessChain.cxx @@ -8,7 +8,7 @@ #include -#include "cm_uv.h" +#include #include "cmGetPipes.h" #include "cmUVHandlePtr.h" diff --git a/Tests/CMakeLib/testUVRAII.cxx b/Tests/CMakeLib/testUVRAII.cxx index cb05ace..0607f44 100644 --- a/Tests/CMakeLib/testUVRAII.cxx +++ b/Tests/CMakeLib/testUVRAII.cxx @@ -3,7 +3,7 @@ #include #include -#include "cm_uv.h" +#include #include "cmUVHandlePtr.h" diff --git a/Tests/CMakeLib/testUVStreambuf.cxx b/Tests/CMakeLib/testUVStreambuf.cxx index cd9c9d4..b86ed76 100644 --- a/Tests/CMakeLib/testUVStreambuf.cxx +++ b/Tests/CMakeLib/testUVStreambuf.cxx @@ -3,10 +3,9 @@ #include #include +#include #include -#include "cm_uv.h" - #include "cmGetPipes.h" #include "cmUVHandlePtr.h" #include "cmUVStreambuf.h" diff --git a/Tests/CPackWiXGenerator/myotherapp.cpp b/Tests/CPackWiXGenerator/myotherapp.cpp index 0eefc1c..5047a34 100644 --- a/Tests/CPackWiXGenerator/myotherapp.cpp +++ b/Tests/CPackWiXGenerator/myotherapp.cpp @@ -1,3 +1,3 @@ int main() { -} \ No newline at end of file +} diff --git a/Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h b/Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h index bf56ec6..2d39178 100644 Binary files a/Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h and b/Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h differ diff --git a/Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp b/Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp index 154e268..0c37370 100644 --- a/Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp +++ b/Tests/VSWindowsFormsResx/WindowsFormsResx/MyForm.cpp @@ -1 +1 @@ -#include "MyForm.h" \ No newline at end of file +#include "MyForm.h" diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp index 87e8bad..66cb282 100644 --- a/Utilities/IWYU/mapping.imp +++ b/Utilities/IWYU/mapping.imp @@ -97,54 +97,15 @@ { symbol: [ "std::enable_if > >::type", private, "\"cmConfigure.h\"", public ] }, { symbol: [ "std::enable_if > >::type", private, "\"cmConfigure.h\"", public ] }, - # KWIML - { include: [ "", public, "\"cm_kwiml.h\"", public ] }, - { include: [ "", public, "\"cm_kwiml.h\"", public ] }, - - # Self-sufficient wrapper for - { symbol: [ "mode_t", private, "\"cm_sys_stat.h\"", public ] }, - - # Wrappers for 3rd-party libraries used from the system. - { include: [ "", private, "\"cm_libarchive.h\"", public ] }, - { include: [ "", private, "\"cm_libarchive.h\"", public ] }, - { include: [ "@", private, "\"cm_curl.h\"", public ] }, - { include: [ "", private, "\"cm_expat.h\"", public ] }, - { include: [ "", private, "\"cm_expat.h\"", public ] }, - { include: [ "", private, "\"cm_jsoncpp_reader.h\"", public ] }, - { include: [ "", private, "\"cm_jsoncpp_value.h\"", public ] }, - { include: [ "", private, "\"cm_jsoncpp_writer.h\"", public ] }, - { include: [ "", private, "\"cm_rhash.h\"", public ] }, - { include: [ "", private, "\"cm_uv.h\"", public ] }, - { include: [ "@", private, "\"cm_uv.h\"", public ] }, - { include: [ "", private, "\"cm_kwiml.h\"", public ] }, - { include: [ "", private, "\"cm_kwiml.h\"", public ] }, - { include: [ "", private, "\"cm_zlib.h\"", public ] }, - { include: [ "", private, "\"cm_zlib.h\"", public ] }, - - # Wrappers for bundled 3rd-party libraries. - { include: [ "\"cmlibarchive/libarchive/archive.h\"", private, "\"cm_libarchive.h\"", public ] }, - { include: [ "\"cmlibarchive/libarchive/archive_entry.h\"", private, "\"cm_libarchive.h\"", public ] }, - { include: [ "@\"cmcurl/include/curl/.+\\.h\"", private, "\"cm_curl.h\"", public ] }, - { include: [ "\"cmexpat/lib/expat.h\"", private, "\"cm_expat.h\"", public ] }, - { include: [ "\"cmexpat/lib/expat_external.h\"", private, "\"cm_expat.h\"", public ] }, - { include: [ "\"cmjsoncpp/include/json/reader.h\"", private, "\"cm_jsoncpp_reader.h\"", public ] }, - { include: [ "\"cmjsoncpp/include/json/value.h\"", private, "\"cm_jsoncpp_value.h\"", public ] }, - { include: [ "\"cmjsoncpp/include/json/writer.h\"", private, "\"cm_jsoncpp_writer.h\"", public ] }, - { include: [ "\"cmlibrhash/librhash/rhash.h\"", private, "\"cm_rhash.h\"", public ] }, - { include: [ "\"cmlibuv/include/uv.h\"", private, "\"cm_uv.h\"", public ] }, - { include: [ "@\"cmlibuv/include/uv/.+\\.h\"", private, "\"cm_uv.h\"", public ] }, - { include: [ "\"KWIML/include/kwiml/abi.h\"", private, "\"cm_kwiml.h\"", public ] }, - { include: [ "\"KWIML/include/kwiml/int.h\"", private, "\"cm_kwiml.h\"", public ] }, - { include: [ "\"cmzlib/cm_zlib_mangle.h\"", private, "\"cm_zlib.h\"", public ] }, - { include: [ "\"cmzlib/zconf.h\"", private, "\"cm_zlib.h\"", public ] }, - { include: [ "\"cmzlib/zlib.h\"", private, "\"cm_zlib.h\"", public ] }, - - # System symbols used by libuv - { symbol: [ "SIGHUP", private, "\"cm_uv.h\"", public ] }, - { symbol: [ "SIGINT", private, "\"cm_uv.h\"", public ] }, - { symbol: [ "ssize_t", private, "\"cm_uv.h\"", public ] }, - - { symbol: [ "Json::ArrayIndex", private, "\"cm_jsoncpp_value.h\"", public ] }, + # Wrappers for 3rd-party libraries + { include: [ "@<.*curl/curlver.h>", private, "", public ] }, + { include: [ "@<.*json/forwards.h>", private, "", public ] }, + { include: [ "@<.*uv/.+\\.h>", private, "", public ] }, + { include: [ "@<.*expat_external.h>", private, "", public ] }, + { include: [ "@<.*zconf.h>", private, "", public ] }, + { include: [ "@<.*cm_zlib_mangle.h>", private, "", public ] }, + # # System symbols used by libuv + { symbol: [ "ssize_t", private, "", public ] }, { symbol: [ "std::ifstream", private, "\"cmsys/FStream.hxx\"", public ] }, { symbol: [ "std::ofstream", private, "\"cmsys/FStream.hxx\"", public ] }, @@ -156,8 +117,6 @@ { include: [ "", public, "\"cmsys/FStream.hxx\"", public ] }, # major and minor are used as macro arguments. Those are false matches. - { symbol: [ "major", private, "\"cm_kwiml.h\"", public ] }, - { symbol: [ "minor", private, "\"cm_kwiml.h\"", public ] }, { symbol: [ "major", private, "\"cmVersion.h\"", public ] }, { symbol: [ "minor", private, "\"cmVersion.h\"", public ] }, diff --git a/Utilities/cm3p/Setup.Configuration.h b/Utilities/cm3p/Setup.Configuration.h new file mode 100644 index 0000000..a5cf058 --- /dev/null +++ b/Utilities/cm3p/Setup.Configuration.h @@ -0,0 +1,8 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_Setup_Configuration_h +#define cm3p_Setup_Configuration_h + +#include // IWYU pragma: export + +#endif diff --git a/Utilities/cm3p/archive.h b/Utilities/cm3p/archive.h new file mode 100644 index 0000000..956b3ab --- /dev/null +++ b/Utilities/cm3p/archive.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_archive_h +#define cm3p_archive_h + +/* Use the libarchive configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_LIBARCHIVE +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/archive_entry.h b/Utilities/cm3p/archive_entry.h new file mode 100644 index 0000000..230e87a --- /dev/null +++ b/Utilities/cm3p/archive_entry.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_archive_entry_h +#define cm3p_archive_entry_h + +/* Use the libarchive configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_LIBARCHIVE +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/bzlib.h b/Utilities/cm3p/bzlib.h new file mode 100644 index 0000000..2a0f4dd --- /dev/null +++ b/Utilities/cm3p/bzlib.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_bzlib_h +#define cm3p_bzlib_h + +/* Use the bzip2 library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_BZIP2 +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/curl/curl.h b/Utilities/cm3p/curl/curl.h new file mode 100644 index 0000000..6e2b822 --- /dev/null +++ b/Utilities/cm3p/curl/curl.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_curl_curl_h +#define cm3p_curl_curl_h + +/* Use the curl library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_CURL +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/expat.h b/Utilities/cm3p/expat.h new file mode 100644 index 0000000..32e6fd0 --- /dev/null +++ b/Utilities/cm3p/expat.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_expat_h +#define cm3p_expat_h + +/* Use the expat library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_EXPAT +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/json/reader.h b/Utilities/cm3p/json/reader.h new file mode 100644 index 0000000..0df09ee --- /dev/null +++ b/Utilities/cm3p/json/reader.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_json_reader_h +#define cm3p_json_reader_h + +/* Use the jsoncpp library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_JSONCPP +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/json/value.h b/Utilities/cm3p/json/value.h new file mode 100644 index 0000000..f59bed6 --- /dev/null +++ b/Utilities/cm3p/json/value.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_json_value_h +#define cm3p_json_value_h + +/* Use the jsoncpp library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_JSONCPP +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/json/writer.h b/Utilities/cm3p/json/writer.h new file mode 100644 index 0000000..7fcc3e2 --- /dev/null +++ b/Utilities/cm3p/json/writer.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_json_writer_h +#define cm3p_json_writer_h + +/* Use the jsoncpp library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_JSONCPP +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/kwiml/abi.h b/Utilities/cm3p/kwiml/abi.h new file mode 100644 index 0000000..6d0dedf --- /dev/null +++ b/Utilities/cm3p/kwiml/abi.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_kwiml_abi_h +#define cm3p_kwiml_abi_h + +/* Use the KWIML library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_KWIML +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/kwiml/int.h b/Utilities/cm3p/kwiml/int.h new file mode 100644 index 0000000..4c7c23d --- /dev/null +++ b/Utilities/cm3p/kwiml/int.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_kwiml_int_h +#define cm3p_kwiml_int_h + +/* Use the KWIML library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_KWIML +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/lzma.h b/Utilities/cm3p/lzma.h new file mode 100644 index 0000000..abfacf3 --- /dev/null +++ b/Utilities/cm3p/lzma.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_lzma_h +#define cm3p_lzma_h + +/* Use the liblzma configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_LIBLZMA +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/rhash.h b/Utilities/cm3p/rhash.h new file mode 100644 index 0000000..9d5e411 --- /dev/null +++ b/Utilities/cm3p/rhash.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_rhash_h +#define cm3p_rhash_h + +/* Use the LibRHash library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_LIBRHASH +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/uv.h b/Utilities/cm3p/uv.h new file mode 100644 index 0000000..307a09f --- /dev/null +++ b/Utilities/cm3p/uv.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_uv_h +#define cm3p_uv_h + +/* Use the libuv library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_LIBUV +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/zlib.h b/Utilities/cm3p/zlib.h new file mode 100644 index 0000000..fe7baee --- /dev/null +++ b/Utilities/cm3p/zlib.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_zlib_h +#define cm3p_zlib_h + +/* Use the zlib library configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_ZLIB +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm3p/zstd.h b/Utilities/cm3p/zstd.h new file mode 100644 index 0000000..07cc3e4 --- /dev/null +++ b/Utilities/cm3p/zstd.h @@ -0,0 +1,14 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm3p_zstd_h +#define cm3p_zstd_h + +/* Use the libzstd configured for CMake. */ +#include "cmThirdParty.h" +#ifdef CMAKE_USE_SYSTEM_ZSTD +# include // IWYU pragma: export +#else +# include // IWYU pragma: export +#endif + +#endif diff --git a/Utilities/cm_bzlib.h b/Utilities/cm_bzlib.h deleted file mode 100644 index 8669e9e..0000000 --- a/Utilities/cm_bzlib.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_bzlib_h -#define cm_bzlib_h - -/* Use the bzip2 library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_BZIP2 -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h deleted file mode 100644 index 673f8ad..0000000 --- a/Utilities/cm_curl.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_curl_h -#define cm_curl_h - -/* Use the curl library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_CURL -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_expat.h b/Utilities/cm_expat.h deleted file mode 100644 index fc5b39a..0000000 --- a/Utilities/cm_expat.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_expat_h -#define cm_expat_h - -/* Use the expat library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_EXPAT -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_jsoncpp_reader.h b/Utilities/cm_jsoncpp_reader.h deleted file mode 100644 index 23af65c..0000000 --- a/Utilities/cm_jsoncpp_reader.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_jsoncpp_reader_h -#define cm_jsoncpp_reader_h - -/* Use the jsoncpp library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_JSONCPP -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_jsoncpp_value.h b/Utilities/cm_jsoncpp_value.h deleted file mode 100644 index 742d99a..0000000 --- a/Utilities/cm_jsoncpp_value.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_jsoncpp_value_h -#define cm_jsoncpp_value_h - -/* Use the jsoncpp library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_JSONCPP -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_jsoncpp_writer.h b/Utilities/cm_jsoncpp_writer.h deleted file mode 100644 index d9e5d82..0000000 --- a/Utilities/cm_jsoncpp_writer.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_jsoncpp_writer_h -#define cm_jsoncpp_writer_h - -/* Use the jsoncpp library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_JSONCPP -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_kwiml.h b/Utilities/cm_kwiml.h deleted file mode 100644 index 566f67e..0000000 --- a/Utilities/cm_kwiml.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_kwiml_h -#define cm_kwiml_h - -/* Use the KWIML library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_KWIML -# include -# include -#else -# include "KWIML/include/kwiml/abi.h" -# include "KWIML/include/kwiml/int.h" -#endif - -#endif diff --git a/Utilities/cm_libarchive.h b/Utilities/cm_libarchive.h deleted file mode 100644 index ea8e9db..0000000 --- a/Utilities/cm_libarchive.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_libarchive_h -#define cm_libarchive_h - -/* Use the libarchive configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_LIBARCHIVE -# include -# include -#else -# include -# include -#endif - -#endif diff --git a/Utilities/cm_lzma.h b/Utilities/cm_lzma.h deleted file mode 100644 index 0526036..0000000 --- a/Utilities/cm_lzma.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_lzma_h -#define cm_lzma_h - -/* Use the liblzma configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_LIBLZMA -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_rhash.h b/Utilities/cm_rhash.h deleted file mode 100644 index 03d9871..0000000 --- a/Utilities/cm_rhash.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_rhash_h -#define cm_rhash_h - -/* Use the LibRHash library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_LIBRHASH -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_uv.h b/Utilities/cm_uv.h deleted file mode 100644 index 448f30d..0000000 --- a/Utilities/cm_uv.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_uv_h -#define cm_uv_h - -/* Use the libuv library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_LIBUV -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_zlib.h b/Utilities/cm_zlib.h deleted file mode 100644 index 2314183..0000000 --- a/Utilities/cm_zlib.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_zlib_h -#define cm_zlib_h - -/* Use the zlib library configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_ZLIB -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cm_zstd.h b/Utilities/cm_zstd.h deleted file mode 100644 index 4bda996..0000000 --- a/Utilities/cm_zstd.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying - file Copyright.txt or https://cmake.org/licensing for details. */ -#ifndef cm_zstd_h -#define cm_zstd_h - -/* Use the libzstd configured for CMake. */ -#include "cmThirdParty.h" -#ifdef CMAKE_USE_SYSTEM_ZSTD -# include -#else -# include -#endif - -#endif diff --git a/Utilities/cmexpat/lib/siphash.h b/Utilities/cmexpat/lib/siphash.h index 95f78f8..a335ec0 100644 --- a/Utilities/cmexpat/lib/siphash.h +++ b/Utilities/cmexpat/lib/siphash.h @@ -97,7 +97,7 @@ #include /* size_t */ -#include +#include #ifndef KWIML_INT_HAVE_UINT64_T # define uint64_t KWIML_INT_uint64_t diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c index 2b1a5e2..5333d47 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include #endif #ifdef HAVE_BZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_gzip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_gzip.c index 95cfd54..ac0b694 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_gzip.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_gzip.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c index 4356b82..05f740b 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include #endif #ifdef HAVE_ZLIB_H -#include /* for crc32 and adler32 */ +#include /* for crc32 and adler32 */ #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_xz.c b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_xz.c index a188186..3223b38 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_xz.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_xz.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include #endif #if HAVE_LZMA_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_zstd.c b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_zstd.c index 4513706..e1ec60e 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_zstd.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_zstd.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include #endif #if HAVE_ZSTD_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c index c9f3527..456b2f8 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c @@ -33,13 +33,13 @@ __FBSDID("$FreeBSD$"); #include #endif #ifdef HAVE_BZLIB_H -#include +#include #endif #ifdef HAVE_LZMA_H -#include +#include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_cab.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_cab.c index c789d13..58644ba 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_cab.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_cab.c @@ -38,7 +38,7 @@ #include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c index cf1419a..9121166 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_iso9660.c 20 #endif #include #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar.c index 1261191..61f2330 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar.c @@ -32,7 +32,7 @@ #include #include #ifdef HAVE_ZLIB_H -#include /* crc32 */ +#include /* crc32 */ #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c index ec40cce..d3a1c1b 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c @@ -31,7 +31,7 @@ #endif #include #ifdef HAVE_ZLIB_H -#include /* crc32 */ +#include /* crc32 */ #endif #ifdef HAVE_LIMITS_H #include diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c index 2bc5c7b..9489e51 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c @@ -39,13 +39,13 @@ __FBSDID("$FreeBSD$"); #include #endif #ifdef HAVE_BZLIB_H -#include +#include #endif #if HAVE_LZMA_H -#include +#include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c index 36831f7..4d71f98 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102 #include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #ifdef HAVE_BZLIB_H #include diff --git a/Utilities/cmlibarchive/libarchive/archive_util.c b/Utilities/cmlibarchive/libarchive/archive_util.c index e4cb051..10dca73 100644 --- a/Utilities/cmlibarchive/libarchive/archive_util.c +++ b/Utilities/cmlibarchive/libarchive/archive_util.c @@ -46,13 +46,13 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_util.c 201098 2009-12-28 02:58:1 #include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #ifdef HAVE_LZMA_H -#include +#include #endif #ifdef HAVE_BZLIB_H -#include +#include #endif #ifdef HAVE_LZ4_H #include diff --git a/Utilities/cmlibarchive/libarchive/archive_version_details.c b/Utilities/cmlibarchive/libarchive/archive_version_details.c index b9af6d7..5f5a5b7 100644 --- a/Utilities/cmlibarchive/libarchive/archive_version_details.c +++ b/Utilities/cmlibarchive/libarchive/archive_version_details.c @@ -34,19 +34,19 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_util.c 201098 2009-12-28 02:58:1 #include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #ifdef HAVE_LZMA_H -#include +#include #endif #ifdef HAVE_BZLIB_H -#include +#include #endif #ifdef HAVE_LZ4_H #include #endif #ifdef HAVE_ZSTD_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_bzip2.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_bzip2.c index 535ef17..0637e96 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_bzip2.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_bzip2.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_bzip2.c 20 #include #endif #ifdef HAVE_BZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_gzip.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_gzip.c index 8d6838b..3e26605 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_gzip.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_gzip.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_gzip.c 201 #endif #include #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_xz.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_xz.c index 2ad4bcb..d567ac9 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_xz.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_xz.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_xz.c 20110 #endif #include #ifdef HAVE_LZMA_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_zstd.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_zstd.c index d0d78a0..f67b025 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_zstd.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_zstd.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include #endif #ifdef HAVE_ZSTD_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c index 1f7e673..c4be9b0 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c @@ -131,7 +131,7 @@ __FBSDID("$FreeBSD$"); #endif #ifdef HAVE_ZLIB_H -#include +#include #endif /* TODO: Support Mac OS 'quarantine' feature. This is really just a diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c index ce96f2f..69af814 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c @@ -31,13 +31,13 @@ __FBSDID("$FreeBSD$"); #endif #include #ifdef HAVE_BZLIB_H -#include +#include #endif #if HAVE_LZMA_H -#include +#include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c index 564d4d7..5db414f 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c @@ -47,7 +47,7 @@ #include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c index 358f61f..3b0ffb3 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c @@ -37,13 +37,13 @@ __FBSDID("$FreeBSD$"); #include #endif #ifdef HAVE_BZLIB_H -#include +#include #endif #if HAVE_LZMA_H -#include +#include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c index 1ede5ee..b0cd215 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_zip.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_zip.c 201168 20 #include #endif #ifdef HAVE_ZLIB_H -#include +#include #endif #include "archive.h" diff --git a/Utilities/cmlibrhash/librhash/byte_order.h b/Utilities/cmlibrhash/librhash/byte_order.h index a58174b..cfb9e25 100644 --- a/Utilities/cmlibrhash/librhash/byte_order.h +++ b/Utilities/cmlibrhash/librhash/byte_order.h @@ -39,7 +39,7 @@ extern "C" { # endif #endif -#include +#include #if KWIML_ABI_ENDIAN_ID == KWIML_ABI_ENDIAN_ID_LITTLE # define CPU_LITTLE_ENDIAN # define IS_BIG_ENDIAN 0 diff --git a/Utilities/cmlibrhash/librhash/ustd.h b/Utilities/cmlibrhash/librhash/ustd.h index 917fb6b..756ce0b 100644 --- a/Utilities/cmlibrhash/librhash/ustd.h +++ b/Utilities/cmlibrhash/librhash/ustd.h @@ -9,7 +9,7 @@ # pragma warning(push,1) #endif -#include +#include #ifndef KWIML_INT_HAVE_INT64_T # define int64_t KWIML_INT_int64_t diff --git a/Utilities/cmnghttp2/cmakeconfig.h.in b/Utilities/cmnghttp2/cmakeconfig.h.in index d6693ee..60698fb 100644 --- a/Utilities/cmnghttp2/cmakeconfig.h.in +++ b/Utilities/cmnghttp2/cmakeconfig.h.in @@ -2,7 +2,8 @@ # pragma warning(push,1) #endif -#include +#include +#include /* Define to `int' if does not define. */ #cmakedefine ssize_t @ssize_t@ diff --git a/Utilities/cmzlib/CMakeLists.txt b/Utilities/cmzlib/CMakeLists.txt index 888c3ff..0584c55 100644 --- a/Utilities/cmzlib/CMakeLists.txt +++ b/Utilities/cmzlib/CMakeLists.txt @@ -38,11 +38,6 @@ CONFIGURE_FILE(${CMZLIB_SOURCE_DIR}/.NoDartCoverage CONFIGURE_FILE(${CMZLIB_SOURCE_DIR}/zlibDllConfig.h.in ${CMZLIB_BINARY_DIR}/zlibDllConfig.h) -FOREACH(name zlib zconf cm_zlib_mangle) - CONFIGURE_FILE(${CMZLIB_SOURCE_DIR}/${name}.h - ${CMZLIB_BINARY_DIR}/${name}.h COPYONLY) -ENDFOREACH(name) - ADD_LIBRARY(cmzlib ${ZLIB_SRCS}) diff --git a/Utilities/std/cm/bits/string_view.cxx b/Utilities/std/cm/bits/string_view.cxx index e345fd3..5381fe6 100644 --- a/Utilities/std/cm/bits/string_view.cxx +++ b/Utilities/std/cm/bits/string_view.cxx @@ -9,7 +9,7 @@ # include # include -# include "cm_kwiml.h" +# include namespace cm { diff --git a/Utilities/std/cm/shared_mutex b/Utilities/std/cm/shared_mutex index 2ac9447..ec63a7b 100644 --- a/Utilities/std/cm/shared_mutex +++ b/Utilities/std/cm/shared_mutex @@ -17,7 +17,7 @@ # include // IWYU pragma: export #endif #if !defined(CMake_HAVE_CXX_SHARED_MUTEX) -# include "cm_uv.h" +# include #endif namespace cm { -- cgit v0.12