Skip to content
Snippets Groups Projects
Commit f19fd9c7 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'gmake-fix'

parents a67552c6 625a5d96
No related branches found
No related tags found
No related merge requests found
......@@ -21,10 +21,10 @@ macro (luajit_build)
if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit
COMMAND make clean
COMMAND make -C src -t buildvm_x86.h buildvm_arm.h
COMMAND $(MAKE) clean
COMMAND $(MAKE) -C src -t buildvm_x86.h buildvm_arm.h
buildvm_x64.h buildvm_x64win.h
COMMAND make -C src ${luajit_buildoptions}
COMMAND $(MAKE) -C src ${luajit_buildoptions}
DEPENDS ${CMAKE_SOURCE_DIR}/CMakeCache.txt
)
else()
......@@ -34,10 +34,10 @@ macro (luajit_build)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit
COMMAND cp -r ${PROJECT_SOURCE_DIR}/third_party/luajit/* .
COMMAND make clean
COMMAND make -C src -t buildvm_x86.h buildvm_arm.h
COMMAND $(MAKE) clean
COMMAND $(MAKE) -C src -t buildvm_x86.h buildvm_arm.h
buildvm_x64.h buildvm_x64win.h
COMMAND make -C src ${luajit_buildoptions}
COMMAND $(MAKE) -C src ${luajit_buildoptions}
DEPENDS ${PROJECT_BINARY_DIR}/CMakeCache.txt ${PROJECT_BINARY_DIR}/third_party/luajit
)
endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment