diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-05-27 19:38:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-27 19:38:17 +0200 |
| commit | f711b635133fea2a137b97caa199f68d3142ed4f (patch) | |
| tree | addaeded20e408a5fb43b300a116c2d37511f028 /third-party/cmake/BuildLuajit.cmake | |
| parent | 5b2cee03c87a1cc54a747f70753c47e0ece028d4 (diff) | |
| parent | 2bfdceba37a62395735878b89b6cf347c9213da6 (diff) | |
| download | rneovim-f711b635133fea2a137b97caa199f68d3142ed4f.tar.gz rneovim-f711b635133fea2a137b97caa199f68d3142ed4f.tar.bz2 rneovim-f711b635133fea2a137b97caa199f68d3142ed4f.zip | |
Merge #8434 'win/build: prefer Ninja'
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 |