Merge remote-tracking branch 'upstream/master' into mix_20240309

3 files changed, 56 insertions, 9 deletions

diff --git a/cmake/Deps.cmake b/cmake/Deps.cmake
index 9966e42084..413e3a08a9 100644
--- a/cmake/Deps.cmake
+++ b/cmake/Deps.cmake
@@ -18,8 +18,16 @@ if(APPLE)
   list(APPEND DEPS_CMAKE_ARGS -D CMAKE_FIND_FRAMEWORK=${CMAKE_FIND_FRAMEWORK})
 endif()
 
-set(DEPS_CMAKE_CACHE_ARGS -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES})
-set(EXTERNALPROJECT_OPTIONS DOWNLOAD_NO_PROGRESS TRUE)
+# Can be removed once minimum version is at least 3.15
+if(POLICY CMP0092)
+  list(APPEND DEPS_CMAKE_ARGS -D CMAKE_POLICY_DEFAULT_CMP0092=NEW)
+endif()
+
+find_program(CACHE_PRG NAMES ccache sccache)
+if(CACHE_PRG)
+  set(CMAKE_C_COMPILER_LAUNCHER ${CMAKE_COMMAND} -E env CCACHE_SLOPPINESS=pch_defines,time_macros ${CACHE_PRG})
+  list(APPEND DEPS_CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER_LAUNCHER:STRING=${CMAKE_C_COMPILER_LAUNCHER})
+endif()
 
 # MAKE_PRG
 if(UNIX)
@@ -49,8 +57,19 @@ set(DEPS_C_COMPILER "${CMAKE_C_COMPILER}")
 if(CMAKE_OSX_SYSROOT)
   set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}")
 endif()
-if(CMAKE_OSX_ARCHITECTURES)
-  foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES)
-    set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -arch ${ARCH}")
-  endforeach()
-endif()
+
+function(get_externalproject_options name DEPS_IGNORE_SHA)
+  string(TOUPPER ${name} name_allcaps)
+  set(url ${${name_allcaps}_URL})
+
+  set(EXTERNALPROJECT_OPTIONS
+    DOWNLOAD_NO_PROGRESS TRUE
+    EXTERNALPROJECT_OPTIONS URL ${${name_allcaps}_URL}
+    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
+
+  if(NOT ${DEPS_IGNORE_SHA})
+    list(APPEND EXTERNALPROJECT_OPTIONS URL_HASH SHA256=${${name_allcaps}_SHA256})
+  endif()
+
+  set(EXTERNALPROJECT_OPTIONS ${EXTERNALPROJECT_OPTIONS} PARENT_SCOPE)
+endfunction()
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake
index 6f93f73bc0..add83bc9cb 100644
--- a/cmake/RunTests.cmake
+++ b/cmake/RunTests.cmake
@@ -4,6 +4,7 @@ set(ENV{VIMRUNTIME} ${WORKING_DIR}/runtime)
 set(ENV{NVIM_RPLUGIN_MANIFEST} ${BUILD_DIR}/Xtest_rplugin_manifest)
 set(ENV{XDG_CONFIG_HOME} ${BUILD_DIR}/Xtest_xdg/config)
 set(ENV{XDG_DATA_HOME} ${BUILD_DIR}/Xtest_xdg/share)
+set(ENV{XDG_STATE_HOME} ${BUILD_DIR}/Xtest_xdg/state)
 unset(ENV{XDG_DATA_DIRS})
 unset(ENV{NVIM})  # Clear $NVIM in case tests are running from Nvim. #11009
 
@@ -46,7 +47,7 @@ if(DEFINED ENV{TEST_FILTER_OUT} AND NOT "$ENV{TEST_FILTER_OUT}" STREQUAL "")
   list(APPEND BUSTED_ARGS --filter-out $ENV{TEST_FILTER_OUT})
 endif()
 
-# TMPDIR: for helpers.tmpname() and Nvim tempname().
+# TMPDIR: for testutil.tmpname() and Nvim tempname().
 set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir")
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR})
 
@@ -57,7 +58,7 @@ if(NOT DEFINED ENV{TEST_TIMEOUT} OR "$ENV{TEST_TIMEOUT}" STREQUAL "")
   set(ENV{TEST_TIMEOUT} 1200)
 endif()
 
-set(ENV{SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_NAME})  # used by test/helpers.lua.
+set(ENV{SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_NAME})  # used by test/testutil.lua.
 
 if(NOT WIN32)
   # Tests assume POSIX "sh" and may fail if SHELL=fish. #24941 #6172
diff --git a/cmake/Util.cmake b/cmake/Util.cmake
index 80f81fd0b4..f09de78668 100644
--- a/cmake/Util.cmake
+++ b/cmake/Util.cmake
@@ -148,6 +148,33 @@ function(add_glob_target)
   add_custom_target(${ARG_TARGET} DEPENDS ${touch_list})
 endfunction()
 
+# A wrapper function that combines add_custom_command and add_custom_target. It
+# essentially models the "make" dependency where a target is only rebuilt if
+# any dependencies have been changed.
+#
+# Important to note is that `DEPENDS` is a bit misleading; it should not only
+# specify dependencies but also the files that are being generated/output
+# files in order to work correctly.
+function(add_target)
+  cmake_parse_arguments(ARG
+    ""
+    ""
+    "COMMAND;DEPENDS;CUSTOM_COMMAND_ARGS"
+    ${ARGN}
+  )
+  set(target ${ARGV0})
+
+  set(touch_file ${TOUCHES_DIR}/${target})
+  add_custom_command(
+    OUTPUT ${touch_file}
+    COMMAND ${CMAKE_COMMAND} -E touch ${touch_file}
+    COMMAND ${CMAKE_COMMAND} -E env "VIMRUNTIME=${NVIM_RUNTIME_DIR}" ${ARG_COMMAND}
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    DEPENDS ${ARG_DEPENDS}
+    ${ARG_CUSTOM_COMMAND_ARGS})
+  add_custom_target(${target} DEPENDS ${touch_file})
+endfunction()
+
 # Set default build type to BUILD_TYPE. Also limit the list of allowable build
 # types to the ones defined in variable allowableBuildTypes.
 #