From ceab0408f8c67b03289e909c8adaf21b0e1c46d3 Mon Sep 17 00:00:00 2001 From: Maryla Date: Thu, 2 Jan 2025 17:20:40 +0100 Subject: [PATCH] Add cmake format check CI. --- .../{clang-format-check.yml => ci-format-check.yml} | 8 ++++++++ cmake/Modules/LocalLibargparse.cmake | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) rename .github/workflows/{clang-format-check.yml => ci-format-check.yml} (76%) diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/ci-format-check.yml similarity index 76% rename from .github/workflows/clang-format-check.yml rename to .github/workflows/ci-format-check.yml index 877cd1751b..6c816a524c 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/ci-format-check.yml @@ -19,3 +19,11 @@ jobs: style: file sources: "apps/*.c,apps/**/*.h,apps/**/*.c,apps/**/*.cc,examples/*.c,include/avif/*.h,src/*.c,tests/*.c,tests/**/*.h,tests/**/*.cc" excludes: "apps/shared/iccjpeg.h,apps/shared/iccjpeg.c" + + cmake-format-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: neg-c/cmake-format-action@v0.1.3 + with: + exclude: libavif.pc.cmake diff --git a/cmake/Modules/LocalLibargparse.cmake b/cmake/Modules/LocalLibargparse.cmake index faad62d01a..01550d1052 100644 --- a/cmake/Modules/LocalLibargparse.cmake +++ b/cmake/Modules/LocalLibargparse.cmake @@ -24,7 +24,10 @@ else() GIT_REPOSITORY "https://github.com/kmurray/libargparse.git" GIT_TAG ${AVIF_LOCAL_LIBARGPARSE_GIT_TAG} # TODO(vrabaud) remove once CMake 3.13 is not supported anymore. - PATCH_COMMAND sed -i.bak -e "s:install.*:include(GNUInstallDirs)\\\\ninstall(TARGETS libargparse RUNTIME DESTINATION \\\\$\\\\{CMAKE_INSTALL_BINDIR\\\\} LIBRARY DESTINATION \\\\$\\\\{CMAKE_INSTALL_LIBDIR\\\\} ARCHIVE DESTINATION \\\\$\\\\{CMAKE_INSTALL_LIBDIR\\\\}):" CMakeLists.txt + PATCH_COMMAND + sed -i.bak -e + "s:install.*:include(GNUInstallDirs)\\\\ninstall(TARGETS libargparse RUNTIME DESTINATION \\\\$\\\\{CMAKE_INSTALL_BINDIR\\\\} LIBRARY DESTINATION \\\\$\\\\{CMAKE_INSTALL_LIBDIR\\\\} ARCHIVE DESTINATION \\\\$\\\\{CMAKE_INSTALL_LIBDIR\\\\}):" + CMakeLists.txt UPDATE_COMMAND "" ) avif_fetchcontent_populate_cmake(libargparse)