build: prefer -D <variable>=<value> over -D<variable>=<value> (#22164)

This makes it easier to see that -D is referring to the entire "<variable>=<value>", rather than only <variable>. It also help syntax highlighters highlight built-in variables.
2024-12-19 10:45:16 -07:00 · 2023-02-08 11:00:16 +01:00 · 2023-02-08 11:00:16 +01:00 · 4d2c1004e9
commit 4d2c1004e9
parent 645daaf5e9
11 changed files with 94 additions and 94 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -65,15 +65,15 @@ else()
    file(MAKE_DIRECTORY ${DEPS_BUILD_DIR})
    execute_process(
      COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR}
-        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-        -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-        -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
-        -DCMAKE_C_FLAGS_MINSIZEREL=${CMAKE_C_FLAGS_MINSIZEREL}
-        -DCMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO}
-        -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
-        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+        -D CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+        -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -D CMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -D CMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+        -D CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
+        -D CMAKE_C_FLAGS_MINSIZEREL=${CMAKE_C_FLAGS_MINSIZEREL}
+        -D CMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO}
+        -D CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
+        -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
        ${PROJECT_SOURCE_DIR}/cmake.deps
      WORKING_DIRECTORY ${DEPS_BUILD_DIR})
    execute_process(
@ -347,15 +347,15 @@ if(BUSTED_PRG)
  if(LUA_HAS_FFI)
    add_custom_target(unittest
      COMMAND ${CMAKE_COMMAND}
-        -DBUSTED_PRG=${BUSTED_PRG}
-        -DLUA_PRG=${LUA_PRG}
-        -DNVIM_PRG=$<TARGET_FILE:nvim>
-        -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-        -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-        -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
-        -DBUILD_DIR=${CMAKE_BINARY_DIR}
-        -DTEST_TYPE=unit
-        -DCIRRUS_CI=$ENV{CIRRUS_CI}
+        -D BUSTED_PRG=${BUSTED_PRG}
+        -D LUA_PRG=${LUA_PRG}
+        -D NVIM_PRG=$<TARGET_FILE:nvim>
+        -D WORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+        -D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
+        -D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
+        -D BUILD_DIR=${CMAKE_BINARY_DIR}
+        -D TEST_TYPE=unit
+        -D CIRRUS_CI=$ENV{CIRRUS_CI}
        -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
      DEPENDS ${UNITTEST_PREREQS}
      USES_TERMINAL)
@ -370,15 +370,15 @@ if(BUSTED_PRG)

  add_custom_target(functionaltest
    COMMAND ${CMAKE_COMMAND}
-      -DBUSTED_PRG=${BUSTED_PRG}
-      -DLUA_PRG=${LUA_PRG}
-      -DNVIM_PRG=$<TARGET_FILE:nvim>
-      -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-      -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-      -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
-      -DBUILD_DIR=${CMAKE_BINARY_DIR}
-      -DTEST_TYPE=functional
-      -DCIRRUS_CI=$ENV{CIRRUS_CI}
+      -D BUSTED_PRG=${BUSTED_PRG}
+      -D LUA_PRG=${LUA_PRG}
+      -D NVIM_PRG=$<TARGET_FILE:nvim>
+      -D WORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+      -D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
+      -D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
+      -D BUILD_DIR=${CMAKE_BINARY_DIR}
+      -D TEST_TYPE=functional
+      -D CIRRUS_CI=$ENV{CIRRUS_CI}
      -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
    DEPENDS ${FUNCTIONALTEST_PREREQS}
    USES_TERMINAL)
@ -386,15 +386,15 @@ if(BUSTED_PRG)

  add_custom_target(benchmark
    COMMAND ${CMAKE_COMMAND}
-      -DBUSTED_PRG=${BUSTED_PRG}
-      -DLUA_PRG=${LUA_PRG}
-      -DNVIM_PRG=$<TARGET_FILE:nvim>
-      -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-      -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-      -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
-      -DBUILD_DIR=${CMAKE_BINARY_DIR}
-      -DTEST_TYPE=benchmark
-      -DCIRRUS_CI=$ENV{CIRRUS_CI}
+      -D BUSTED_PRG=${BUSTED_PRG}
+      -D LUA_PRG=${LUA_PRG}
+      -D NVIM_PRG=$<TARGET_FILE:nvim>
+      -D WORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+      -D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
+      -D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
+      -D BUILD_DIR=${CMAKE_BINARY_DIR}
+      -D TEST_TYPE=benchmark
+      -D CIRRUS_CI=$ENV{CIRRUS_CI}
      -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
    DEPENDS ${BENCHMARK_PREREQS}
    USES_TERMINAL)
@ -404,15 +404,15 @@ endif()
 if(BUSTED_LUA_PRG)
  add_custom_target(functionaltest-lua
    COMMAND ${CMAKE_COMMAND}
-      -DBUSTED_PRG=${BUSTED_LUA_PRG}
-      -DLUA_PRG=${LUA_PRG}
-      -DNVIM_PRG=$<TARGET_FILE:nvim>
-      -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-      -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-      -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
-      -DBUILD_DIR=${CMAKE_BINARY_DIR}
-      -DTEST_TYPE=functional
-      -DCIRRUS_CI=$ENV{CIRRUS_CI}
+      -D BUSTED_PRG=${BUSTED_LUA_PRG}
+      -D LUA_PRG=${LUA_PRG}
+      -D NVIM_PRG=$<TARGET_FILE:nvim>
+      -D WORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+      -D BUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
+      -D TEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
+      -D BUILD_DIR=${CMAKE_BINARY_DIR}
+      -D TEST_TYPE=functional
+      -D CIRRUS_CI=$ENV{CIRRUS_CI}
      -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
    DEPENDS ${FUNCTIONALTEST_PREREQS}
    USES_TERMINAL)
--- a/cmake.deps/CMakeLists.txt
+++ b/cmake.deps/CMakeLists.txt
@ -13,10 +13,10 @@ include(CheckCCompilerFlag)
 include(Util)

 set(DEPS_CMAKE_ARGS
-  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-  -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-  -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
+  -D CMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+  -D CMAKE_GENERATOR=${CMAKE_GENERATOR}
+  -D CMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+  -D CMAKE_POSITION_INDEPENDENT_CODE=ON)

 set(DEPS_CMAKE_CACHE_ARGS -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES})

@ -24,7 +24,7 @@ set_default_buildtype()

 get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(NOT isMultiConfig)
-  list(APPEND DEPS_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+  list(APPEND DEPS_CMAKE_ARGS -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
 endif()

 set(DEFAULT_MAKE_CFLAGS CFLAGS+=-g)
@ -45,7 +45,7 @@ else()
  set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr" CACHE PATH "Dependencies install directory.")
 endif()

-list(APPEND DEPS_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR})
+list(APPEND DEPS_CMAKE_ARGS -D CMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR})

 set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin" CACHE PATH "Dependencies binary install directory.")
 set(DEPS_LIB_DIR "${DEPS_INSTALL_DIR}/lib" CACHE PATH "Dependencies library install directory.")
@ -282,7 +282,7 @@ if (MSVC)
 else()
  add_custom_target(clean-shared-libraries
    COMMAND ${CMAKE_COMMAND}
-      -DREMOVE_FILE_GLOB=${DEPS_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}*
+      -D REMOVE_FILE_GLOB=${DEPS_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}*
      -P ${PROJECT_SOURCE_DIR}/cmake/RemoveFiles.cmake
    DEPENDS ${THIRD_PARTY_DEPS}
  )
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@ -11,8 +11,8 @@ if(MSVC)
      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GettextCMakeLists.txt
      ${DEPS_BUILD_DIR}/src/gettext/CMakeLists.txt
    CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-      -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
-      -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
+      -D LIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
+      -D LIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 else()
  message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
--- a/cmake.deps/cmake/BuildLibtermkey.cmake
+++ b/cmake.deps/cmake/BuildLibtermkey.cmake
@ -10,9 +10,9 @@ ExternalProject_Add(libtermkey
    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/libtermkeyCMakeLists.txt
    ${DEPS_BUILD_DIR}/src/libtermkey/CMakeLists.txt
  CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-    -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="" # Hack to avoid -rdynamic in Mingw
-    -DUNIBILIUM_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
-    -DUNIBILIUM_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}
+    -D CMAKE_SHARED_LIBRARY_LINK_C_FLAGS="" # Hack to avoid -rdynamic in Mingw
+    -D UNIBILIUM_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
+    -D UNIBILIUM_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}
  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})

 list(APPEND THIRD_PARTY_DEPS libtermkey)
--- a/cmake.deps/cmake/BuildLibuv.cmake
+++ b/cmake.deps/cmake/BuildLibuv.cmake
@ -7,9 +7,9 @@ ExternalProject_Add(libuv
  DOWNLOAD_NO_PROGRESS TRUE
  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libuv
  CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-    -DCMAKE_INSTALL_LIBDIR=lib
-    -DBUILD_TESTING=OFF
-    -DLIBUV_BUILD_SHARED=OFF
+    -D CMAKE_INSTALL_LIBDIR=lib
+    -D BUILD_TESTING=OFF
+    -D LIBUV_BUILD_SHARED=OFF
  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})

 list(APPEND THIRD_PARTY_DEPS libuv)
--- a/cmake.deps/cmake/BuildLuv.cmake
+++ b/cmake.deps/cmake/BuildLuv.cmake
@ -2,37 +2,37 @@ set(LUV_INCLUDE_FLAGS
  "-I${DEPS_INSTALL_DIR}/include -I${DEPS_INSTALL_DIR}/include/luajit-2.1")

 set(LUV_CMAKE_ARGS
-  -DLUA_BUILD_TYPE=System
-  -DLUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3
-  -DWITH_SHARED_LIBUV=ON
-  -DBUILD_SHARED_LIBS=OFF
-  -DBUILD_STATIC_LIBS=ON
-  -DBUILD_MODULE=OFF)
+  -D LUA_BUILD_TYPE=System
+  -D LUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3
+  -D WITH_SHARED_LIBUV=ON
+  -D BUILD_SHARED_LIBS=OFF
+  -D BUILD_STATIC_LIBS=ON
+  -D BUILD_MODULE=OFF)

 if(USE_BUNDLED_LUAJIT)
-  list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=LuaJit)
+  list(APPEND LUV_CMAKE_ARGS -D WITH_LUA_ENGINE=LuaJit)
 elseif(USE_BUNDLED_LUA)
-  list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=Lua)
+  list(APPEND LUV_CMAKE_ARGS -D WITH_LUA_ENGINE=Lua)
 else()
  find_package(LuaJit)
  if(LUAJIT_FOUND)
-    list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=LuaJit)
+    list(APPEND LUV_CMAKE_ARGS -D WITH_LUA_ENGINE=LuaJit)
  else()
-    list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=Lua)
+    list(APPEND LUV_CMAKE_ARGS -D WITH_LUA_ENGINE=Lua)
  endif()
 endif()

 if(USE_BUNDLED_LIBUV)
  list(APPEND LUV_CMAKE_ARGS
-    -DCMAKE_PREFIX_PATH=${DEPS_INSTALL_DIR}
-    -DLIBUV_LIBRARIES=uv_a)
+    -D CMAKE_PREFIX_PATH=${DEPS_INSTALL_DIR}
+    -D LIBUV_LIBRARIES=uv_a)
 endif()

 list(APPEND LUV_CMAKE_ARGS
  "-DCMAKE_C_FLAGS:STRING=${LUV_INCLUDE_FLAGS}")
 if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND
    (CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly"))
-    list(APPEND LUV_CMAKE_ARGS -DCMAKE_MAKE_PROGRAM=gmake)
+    list(APPEND LUV_CMAKE_ARGS -D CMAKE_MAKE_PROGRAM=gmake)
 endif()

 if(USE_EXISTING_SRC_DIR)
--- a/cmake.deps/cmake/BuildMsgpack.cmake
+++ b/cmake.deps/cmake/BuildMsgpack.cmake
@ -7,8 +7,8 @@ ExternalProject_Add(msgpack
  DOWNLOAD_NO_PROGRESS TRUE
  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack
  CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-    -DMSGPACK_BUILD_TESTS=OFF
-    -DMSGPACK_BUILD_EXAMPLES=OFF
+    -D MSGPACK_BUILD_TESTS=OFF
+    -D MSGPACK_BUILD_EXAMPLES=OFF
  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})

 list(APPEND THIRD_PARTY_DEPS msgpack)
--- a/cmake.deps/cmake/BuildTreesitterParsers.cmake
+++ b/cmake.deps/cmake/BuildTreesitterParsers.cmake
@ -12,7 +12,7 @@ function(BuildTSParser LANG TS_URL TS_SHA256 TS_CMAKE_FILE)
      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${TS_CMAKE_FILE}
      ${DEPS_BUILD_DIR}/src/${NAME}/CMakeLists.txt
    CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-      -DPARSERLANG=${LANG}
+      -D PARSERLANG=${LANG}
    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 endfunction()

--- a/cmake/WindowsDllCopy.cmake
+++ b/cmake/WindowsDllCopy.cmake
@ -6,13 +6,13 @@
 # - CMAKE_PREFIX_PATH: A list of directories to search for dependencies

 if(NOT DEFINED BINARY)
-  message(FATAL_ERROR "Missing required argument -DBINARY=")
+  message(FATAL_ERROR "Missing required argument -D BINARY=")
 endif()
 if(NOT DEFINED DST)
-  message(FATAL_ERROR "Missing required arguments -DDST=")
+  message(FATAL_ERROR "Missing required arguments -D DST=")
 endif()
 if(NOT DEFINED CMAKE_PREFIX_PATH)
-  message(FATAL_ERROR "Missing required arguments -DCMAKE_PREFIX_PATH=")
+  message(FATAL_ERROR "Missing required arguments -D CMAKE_PREFIX_PATH=")
 endif()

 include(GetPrerequisites)
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@ -449,12 +449,12 @@ set(gen_cflags ${gen_cflags} -O2)
 set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h)
 add_custom_target(update_version_stamp
  COMMAND ${CMAKE_COMMAND}
-    -DNVIM_VERSION_MAJOR=${NVIM_VERSION_MAJOR}
-    -DNVIM_VERSION_MINOR=${NVIM_VERSION_MINOR}
-    -DNVIM_VERSION_PATCH=${NVIM_VERSION_PATCH}
-    -DNVIM_VERSION_PRERELEASE=${NVIM_VERSION_PRERELEASE}
-    -DOUTPUT=${NVIM_VERSION_GIT_H}
-    -DNVIM_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+    -D NVIM_VERSION_MAJOR=${NVIM_VERSION_MAJOR}
+    -D NVIM_VERSION_MINOR=${NVIM_VERSION_MINOR}
+    -D NVIM_VERSION_PATCH=${NVIM_VERSION_PATCH}
+    -D NVIM_VERSION_PRERELEASE=${NVIM_VERSION_PRERELEASE}
+    -D OUTPUT=${NVIM_VERSION_GIT_H}
+    -D NVIM_SOURCE_DIR=${CMAKE_SOURCE_DIR}
    -P ${PROJECT_SOURCE_DIR}/cmake/GenerateVersion.cmake
  BYPRODUCTS ${NVIM_VERSION_GIT_H})

@ -706,9 +706,9 @@ if(WIN32)
  add_custom_target(nvim_dll_deps DEPENDS nvim
    COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/windows_runtime_deps
    COMMAND ${CMAKE_COMMAND}
-      "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
-      -DBINARY="${PROJECT_BINARY_DIR}/bin/nvim${CMAKE_EXECUTABLE_SUFFIX}"
-      -DDST=${PROJECT_BINARY_DIR}/windows_runtime_deps
+      -D CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+      -D BINARY="${PROJECT_BINARY_DIR}/bin/nvim${CMAKE_EXECUTABLE_SUFFIX}"
+      -D DST=${PROJECT_BINARY_DIR}/windows_runtime_deps
      -P ${PROJECT_SOURCE_DIR}/cmake/WindowsDllCopy.cmake)
  add_dependencies(nvim_runtime_deps nvim_dll_deps)

--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@ -100,12 +100,12 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)

    add_custom_target(update-po-${lang}
      COMMAND ${CMAKE_COMMAND}
-        -DICONV_PRG=${ICONV_PRG}
-        -DINPUT_FILE=${inputFile}
-        -DOUTPUT_FILE=${outputFile}
-        -DINPUT_ENC=${inputEnc}
-        -DOUTPUT_ENC=${outputEnc}
-        -DOUTPUT_CHARSET=${outputCharSet}
+        -D ICONV_PRG=${ICONV_PRG}
+        -D INPUT_FILE=${inputFile}
+        -D OUTPUT_FILE=${outputFile}
+        -D INPUT_ENC=${inputEnc}
+        -D OUTPUT_ENC=${outputEnc}
+        -D OUTPUT_CHARSET=${outputCharSet}
        -P ${PROJECT_SOURCE_DIR}/cmake/ConvertPo.cmake
      COMMENT "Updating ${outputName}.po"
      DEPENDS ${inputFile})