From 2d0530dbfa3d799649a50d0ae9a3cdd145b8e4dd Mon Sep 17 00:00:00 2001 From: Su_Laus Date: Mon, 26 Dec 2022 17:39:48 +0100 Subject: [PATCH] Disable clang-formatting for tif_config.h.cmake.in and tiffconf.h.cmake.in because sensitive for CMake scripts. --- .pre-commit-config.yaml | 11 ++++++++++- libtiff/tif_config.h.cmake.in | 7 +++++++ libtiff/tif_config.h.in | 7 +++++++ libtiff/tiffconf.h.cmake.in | 7 +++++++ libtiff/tiffconf.h.in | 7 +++++++ 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dbad088d..9b3e0e0c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,8 +6,17 @@ repos: # tif_fax3sm.c is a generated file # tiffvers.h as well, and its formatting is sensitive for # FindTIFF.cmake to detect the version number + # Furthermore, the .in files are formatting sensitive for + # cmake functions. exclude: > (?x)^( libtiff/tif_fax3sm.c| - libtiff/tiffvers.h + libtiff/tiffvers.h| + libtiff/tiffvers.h.in| + libtiff/tif_config.h| + libtiff/tif_config.h.in| + libtiff/tif_config.h.cmake.in| + libtiff/tiffconf.h| + libtiff/tiffconf.h.in| + libtiff/tiffconf.h.cmake.in ) diff --git a/libtiff/tif_config.h.cmake.in b/libtiff/tif_config.h.cmake.in index 570e4e1b..b56f01ee 100644 --- a/libtiff/tif_config.h.cmake.in +++ b/libtiff/tif_config.h.cmake.in @@ -1,3 +1,8 @@ +/* clang-format off */ +/* clang-format disabled because CMake scripts are very sensitive to the + * formatting of this file. + */ + /* libtiff/tif_config.h.cmake.in. Not generated, but originated from autoheader. */ /* This file must be kept up-to-date with needed substitutions from libtiff/tif_config.h.in. */ @@ -156,3 +161,5 @@ #else # error "Unsupported size_t size; please submit a bug report" #endif + +/* clang-format on */ diff --git a/libtiff/tif_config.h.in b/libtiff/tif_config.h.in index 8fb78c38..9f519851 100644 --- a/libtiff/tif_config.h.in +++ b/libtiff/tif_config.h.in @@ -1,3 +1,8 @@ +/* clang-format off */ +/* clang-format disabled because CMake scripts are very sensitive to the + * formatting of this file. + */ + /* libtiff/tif_config.h.in. Not generated, but originated from autoheader. */ #include "tiffconf.h" @@ -172,3 +177,5 @@ #else # error "Unsupported size_t size; please submit a bug report" #endif + +/* clang-format on */ diff --git a/libtiff/tiffconf.h.cmake.in b/libtiff/tiffconf.h.cmake.in index 5afbf3b2..9cd6b746 100644 --- a/libtiff/tiffconf.h.cmake.in +++ b/libtiff/tiffconf.h.cmake.in @@ -4,6 +4,11 @@ from this file in your programs. */ +/* clang-format off */ +/* clang-format disabled because CMake scripts are very sensitive to the + * formatting of this file. + */ + #ifndef _TIFFCONF_ #define _TIFFCONF_ @@ -125,3 +130,5 @@ #define IPTC_SUPPORT #endif /* _TIFFCONF_ */ + +/* clang-format on */ diff --git a/libtiff/tiffconf.h.in b/libtiff/tiffconf.h.in index 6703eb0e..7c9559da 100644 --- a/libtiff/tiffconf.h.in +++ b/libtiff/tiffconf.h.in @@ -4,6 +4,11 @@ from this file in your programs. */ +/* clang-format off */ +/* clang-format disabled because CMake scripts are very sensitive to the + * formatting of this file. + */ + #ifndef _TIFFCONF_ #define _TIFFCONF_ @@ -125,3 +130,5 @@ #define IPTC_SUPPORT #endif /* _TIFFCONF_ */ + +/* clang-format on */