Merge #19626 build: cleanup old cmake files

6 files changed, 11 insertions, 30 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/cmake/InstallHelpers.cmake b/cmake/InstallHelpers.cmake
index 9d997260cd..3786c4177f 100644
--- a/cmake/InstallHelpers.cmake
+++ b/cmake/InstallHelpers.cmake
@@ -45,7 +45,7 @@ function(create_install_dir_with_perms)
     while(NOT EXISTS \$ENV{DESTDIR}\${_current_dir} AND NOT \${_prev_dir} STREQUAL \${_current_dir})
       list(APPEND _parent_dirs \${_current_dir})
       set(_prev_dir \${_current_dir})
-      get_filename_component(_current_dir \${_current_dir} PATH)
+      get_filename_component(_current_dir \${_current_dir} DIRECTORY)
     endwhile()
 
     if(_parent_dirs)
diff --git a/cmake/i386-linux-gnu.toolchain.cmake b/cmake/i386-linux-gnu.toolchain.cmake
deleted file mode 100644
index 089e37e5e8..0000000000
--- a/cmake/i386-linux-gnu.toolchain.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set(CMAKE_SYSTEM_PROCESSOR i386)
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION gnu)
-if(NOT ${CMAKE_C_COMPILER})
-  set(CMAKE_C_COMPILER gcc)
-endif()
-set(CMAKE_C_COMPILER_ARG1 "-m32")
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index f656f1cbc3..e0a0b34d28 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -117,7 +117,7 @@ endif()
 globrecurse_wrapper(RUNTIME_PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR} *.awk *.sh *.bat)
 
 foreach(PROG ${RUNTIME_PROGRAMS})
-  get_filename_component(BASEDIR ${PROG} PATH)
+  get_filename_component(BASEDIR ${PROG} DIRECTORY)
   install_helper(PROGRAMS ${PROG}
                  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/${BASEDIR})
 endforeach()
@@ -126,7 +126,7 @@ globrecurse_wrapper(RUNTIME_FILES ${CMAKE_CURRENT_SOURCE_DIR}
   *.vim *.lua *.dict *.py *.rb *.ps *.spl *.tutor *.tutor.json)
 
 foreach(F ${RUNTIME_FILES})
-  get_filename_component(BASEDIR ${F} PATH)
+  get_filename_component(BASEDIR ${F} DIRECTORY)
   install_helper(FILES ${F}
                  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/${BASEDIR})
 endforeach()
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 017883a913..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)
@@ -225,7 +225,7 @@ foreach(sfile ${NVIM_SOURCES}
               "${GENERATED_KEYSETS}"
               "${GENERATED_UI_EVENTS_CLIENT}"
               )
-  get_filename_component(full_d ${sfile} PATH)
+  get_filename_component(full_d ${sfile} DIRECTORY)
   file(RELATIVE_PATH d "${CMAKE_CURRENT_LIST_DIR}" "${full_d}")
   if(${d} MATCHES "^[.][.]|auto/")
     file(RELATIVE_PATH d "${GENERATED_DIR}" "${full_d}")
@@ -597,10 +597,7 @@ set_target_properties(
     POSITION_INDEPENDENT_CODE ON
     OUTPUT_NAME ${LIBNVIM_NAME}
 )
-set_property(
-  TARGET libnvim
-  APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_LIB "
-)
+target_compile_options(libnvim PRIVATE -DMAKE_LIB)
 
 if(NOT LUAJIT_FOUND)
   message(STATUS "luajit not found, skipping nvim-test (unit tests) target")
@@ -626,10 +623,7 @@ else()
     PROPERTIES
       POSITION_INDEPENDENT_CODE ON
   )
-  set_property(
-    TARGET nvim-test
-    APPEND_STRING PROPERTY COMPILE_FLAGS " -DUNIT_TESTING "
-  )
+  target_compile_options(nvim-test PRIVATE -DUNIT_TESTING)
 endif()
 
 if(CLANG_ASAN_UBSAN)
@@ -664,7 +658,7 @@ elseif(CLANG_TSAN)
 endif()
 
 function(get_test_target prefix sfile relative_path_var target_var)
-  get_filename_component(full_d "${sfile}" PATH)
+  get_filename_component(full_d "${sfile}" DIRECTORY)
   file(RELATIVE_PATH d "${PROJECT_SOURCE_DIR}/src/nvim" "${full_d}")
   if(d MATCHES "^[.][.]")
     file(RELATIVE_PATH d "${GENERATED_DIR}" "${full_d}")
@@ -730,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)
diff --git a/test/includes/CMakeLists.txt b/test/includes/CMakeLists.txt
index 4d7e962fbd..b4da4c0611 100644
--- a/test/includes/CMakeLists.txt
+++ b/test/includes/CMakeLists.txt
@@ -16,7 +16,7 @@ endforeach()
 
 foreach(hfile ${PRE_HEADERS})
   string(REGEX REPLACE ^pre/ post/ post_hfile ${hfile})
-  get_filename_component(hdir ${CMAKE_CURRENT_BINARY_DIR}/${post_hfile} PATH)
+  get_filename_component(hdir ${CMAKE_CURRENT_BINARY_DIR}/${post_hfile} DIRECTORY)
   file(MAKE_DIRECTORY ${hdir})
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${post_hfile}