diff options
author | erw7 <erw7.github@gmail.com> | 2018-05-21 19:32:19 +0900 |
---|---|---|
committer | erw7 <erw7.github@gmail.com> | 2018-05-21 19:32:19 +0900 |
commit | 828c9baad2a691ba87a99ee7dda7d7ac3b32cbe5 (patch) | |
tree | 11c4178480673732b191918408e6dad644e1924a /third-party/cmake/BuildLuajit.cmake | |
parent | 35cc15e157cd4cdf74b223fe08014a48aeffbb3a (diff) | |
download | rneovim-828c9baad2a691ba87a99ee7dda7d7ac3b32cbe5.tar.gz rneovim-828c9baad2a691ba87a99ee7dda7d7ac3b32cbe5.tar.bz2 rneovim-828c9baad2a691ba87a99ee7dda7d7ac3b32cbe5.zip |
Change to enable build by Ninja on Windows
Diffstat (limited to 'third-party/cmake/BuildLuajit.cmake')
-rw-r--r-- | third-party/cmake/BuildLuajit.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake index 2fda221b12..721bca9f63 100644 --- a/third-party/cmake/BuildLuajit.cmake +++ b/third-party/cmake/BuildLuajit.cmake @@ -78,8 +78,12 @@ elseif(MINGW AND CMAKE_CROSSCOMPILING) elseif(MINGW) - - BuildLuaJit(BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} CC=${DEPS_C_COMPILER} + if(CMAKE_GENERATOR MATCHES "Ninja") + set(LUAJIT_MAKE_PRG ${MAKE_PRG}) + else() + set(LUAJIT_MAKE_PRG ${CMAKE_MAKE_PROGRAM}) + endif() + BuildLuaJit(BUILD_COMMAND ${LUAJIT_MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} CFLAGS+=-DLUAJIT_DISABLE_JIT CFLAGS+=-DLUA_USE_APICHECK @@ -87,7 +91,7 @@ elseif(MINGW) CCDEBUG+=-g BUILDMODE=static # Build a DLL too - COMMAND ${CMAKE_MAKE_PROGRAM} CC=${DEPS_C_COMPILER} BUILDMODE=dynamic + COMMAND ${LUAJIT_MAKE_PRG} CC=${DEPS_C_COMPILER} BUILDMODE=dynamic INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/luajit.exe ${DEPS_INSTALL_DIR}/bin |