aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDundar Goc <gocdundar@gmail.com>2022-07-01 17:06:29 +0200
committerDundar Goc <gocdundar@gmail.com>2022-08-03 09:52:05 +0200
commitd3bfc03c5d88466d2644cfaddcce48805b10ebca (patch)
tree3c3924fb1eeac0df67232fce40f0fb03056f1f84
parentba3742ed0df1f2e25acb1ec38dcdc59b6ff7d7e7 (diff)
downloadrneovim-d3bfc03c5d88466d2644cfaddcce48805b10ebca.tar.gz
rneovim-d3bfc03c5d88466d2644cfaddcce48805b10ebca.tar.bz2
rneovim-d3bfc03c5d88466d2644cfaddcce48805b10ebca.zip
build: remove InstallClintErrors.cmake
Replace its functionality by copying the entire directory where the reports are instead.
-rw-r--r--cmake/InstallClintErrors.cmake2
-rwxr-xr-xsrc/nvim/CMakeLists.txt10
2 files changed, 3 insertions, 9 deletions
diff --git a/cmake/InstallClintErrors.cmake b/cmake/InstallClintErrors.cmake
deleted file mode 100644
index bd5ca07828..0000000000
--- a/cmake/InstallClintErrors.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-file(GLOB_RECURSE JSON_FILES *.json)
-file(COPY ${JSON_FILES} DESTINATION "${TARGET}")
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 65af69c539..b743e9923f 100755
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -77,7 +77,7 @@ set(LINT_SUPPRESSES_ROOT ${PROJECT_BINARY_DIR}/errors)
set(LINT_SUPPRESSES_URL "${LINT_SUPPRESS_URL_BASE}/errors.tar.gz")
set(LINT_SUPPRESSES_ARCHIVE ${LINT_SUPPRESSES_ROOT}/errors.tar.gz)
set(LINT_SUPPRESSES_TOUCH_FILE "${TOUCHES_DIR}/unpacked-clint-errors-archive")
-set(LINT_SUPPRESSES_INSTALL_SCRIPT "${PROJECT_SOURCE_DIR}/cmake/InstallClintErrors.cmake")
+set(CLINT_REPORT_PATH ${LINT_SUPPRESSES_ROOT}/src/home/runner/work/doc/doc/gh-pages/reports/clint)
glob_wrapper(UNICODE_FILES ${UNICODE_DIR}/*.txt)
glob_wrapper(API_HEADERS api/*.h)
@@ -724,13 +724,9 @@ add_custom_command(
OUTPUT ${LINT_SUPPRESSES_TOUCH_FILE}
WORKING_DIRECTORY ${LINT_SUPPRESSES_ROOT}/src
COMMAND ${CMAKE_COMMAND} -E tar xfz ${LINT_SUPPRESSES_ARCHIVE}
- COMMAND
- ${CMAKE_COMMAND}
- -DTARGET=${LINT_SUPPRESSES_ROOT}
- -P ${LINT_SUPPRESSES_INSTALL_SCRIPT}
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CLINT_REPORT_PATH} "${LINT_SUPPRESSES_ROOT}"
COMMAND ${CMAKE_COMMAND} -E touch ${LINT_SUPPRESSES_TOUCH_FILE}
- DEPENDS
- ${LINT_SUPPRESSES_ARCHIVE} ${LINT_SUPPRESSES_INSTALL_SCRIPT}
+ DEPENDS ${LINT_SUPPRESSES_ARCHIVE}
)
add_download(${LINT_SUPPRESS_FILE} ${LINT_SUPPRESS_URL} off)