diff options
| author | b-r-o-c-k <brockmammen@gmail.com> | 2018-03-06 20:38:10 -0600 |
|---|---|---|
| committer | b-r-o-c-k <brockmammen@gmail.com> | 2018-03-06 20:52:27 -0600 |
| commit | 8ba8d7244fae5783fbda9aac35bc03a035bf1479 (patch) | |
| tree | 87800e6562fa9909c6999b214c65b7f11295b2ae | |
| parent | c29a82c45f7be0f7ea46311e16a46a94f2173b98 (diff) | |
| download | rneovim-8ba8d7244fae5783fbda9aac35bc03a035bf1479.tar.gz rneovim-8ba8d7244fae5783fbda9aac35bc03a035bf1479.tar.bz2 rneovim-8ba8d7244fae5783fbda9aac35bc03a035bf1479.zip | |
build/msvc: Add Git as a requirement for Windows patches
| -rw-r--r-- | third-party/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | third-party/cmake/BuildLibvterm.cmake | 4 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index c523ecea00..7c95bbb91d 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -50,6 +50,13 @@ endif() option(USE_EXISTING_SRC_DIR "Skip download of deps sources in case of existing source directory." OFF) +if(WIN32) + find_package(Git) + if(NOT Git_FOUND) + message(FATAL_ERROR "Git is required to apply patches for Windows.") + endif() +endif() + if(UNIX) find_program(MAKE_PRG NAMES gmake make) if(MAKE_PRG) diff --git a/third-party/cmake/BuildLibvterm.cmake b/third-party/cmake/BuildLibvterm.cmake index 5fb077e972..73e2990654 100644 --- a/third-party/cmake/BuildLibvterm.cmake +++ b/third-party/cmake/BuildLibvterm.cmake @@ -37,8 +37,8 @@ endfunction() if(WIN32) if(MSVC) set(LIBVTERM_PATCH_COMMAND - git -C ${DEPS_BUILD_DIR}/src/libvterm init - COMMAND git -C ${DEPS_BUILD_DIR}/src/libvterm apply + ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/libvterm init + COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/libvterm apply ${CMAKE_CURRENT_SOURCE_DIR}/patches/libvterm-Remove-VLAs-for-MSVC.patch) endif() set(LIBVTERM_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 297fedb888..47c6412d86 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -84,8 +84,8 @@ elseif(MSVC OR MINGW) # Ignore USE_BUNDLED_LUAJIT - always ON for native Win32 BuildLuarocks( PATCH_COMMAND - git -C ${DEPS_BUILD_DIR}/src/luarocks init - COMMAND git -C ${DEPS_BUILD_DIR}/src/luarocks apply + ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/luarocks init + COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/luarocks apply ${CMAKE_CURRENT_SOURCE_DIR}/patches/luarocks-Change-default-downloader-to-curl.patch INSTALL_COMMAND install.bat /FORCECONFIG /NOREG /NOADMIN /Q /F /LUA ${DEPS_INSTALL_DIR} |