diff options
author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-05-18 16:27:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-18 16:27:47 +0200 |
commit | 826b95203ac9c8decf02e332fbb55cf4ebf73aef (patch) | |
tree | 222fd6410b7010759575c54d9317c5df0ac47738 /src | |
parent | c40872acbddb61fd084203af60a86c7ec404d716 (diff) | |
download | rneovim-826b95203ac9c8decf02e332fbb55cf4ebf73aef.tar.gz rneovim-826b95203ac9c8decf02e332fbb55cf4ebf73aef.tar.bz2 rneovim-826b95203ac9c8decf02e332fbb55cf4ebf73aef.zip |
build: bundle uncrustify
Uncrustify is sensitive to version changes, which causes friction for
contributors that doesn't have that exact version. It's also simpler to
download and install the correct version than to have bespoke version
checking.
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/CMakeLists.txt | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 070cea3b59..47f32abc07 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -888,18 +888,13 @@ add_glob_target( EXCLUDE tui/terminfo_defs.h) -add_custom_target(uncrustify-version - COMMAND ${CMAKE_COMMAND} - -D UNCRUSTIFY_PRG=${UNCRUSTIFY_PRG} - -D CONFIG_FILE=${PROJECT_SOURCE_DIR}/src/uncrustify.cfg - -P ${PROJECT_SOURCE_DIR}/cmake/CheckUncrustifyVersion.cmake) - +set(UNCRUSTIFY_PRG ${DEPS_BIN_DIR}/uncrustify) add_glob_target( TARGET lintc-uncrustify COMMAND ${UNCRUSTIFY_PRG} FLAGS -c "${PROJECT_SOURCE_DIR}/src/uncrustify.cfg" -q --check FILES ${LINT_NVIM_SOURCES}) -add_dependencies(lintc-uncrustify uncrustify-version) +add_dependencies(lintc-uncrustify uncrustify) add_custom_target(lintc) add_dependencies(lintc lintc-clint lintc-uncrustify) @@ -910,7 +905,7 @@ add_custom_target(formatc -D LANG=c -P ${PROJECT_SOURCE_DIR}/cmake/Format.cmake WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) -add_dependencies(formatc uncrustify-version) +add_dependencies(formatc uncrustify) add_custom_target(generated-sources DEPENDS ${NVIM_GENERATED_FOR_SOURCES} |