Skip to content
Snippets Groups Projects
Commit dcb678e4 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Merge branch 'stable'

parents 8beaf170 d7d1e36f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
cmake/luajit.cmake
+ 1
− 1
View file @ dcb678e4
...@@ -182,7 +182,7 @@ macro(luajit_build) ...@@ -182,7 +182,7 @@ macro(luajit_build)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit
COMMAND cp -r ${PROJECT_SOURCE_DIR}/third_party/luajit/* . COMMAND cp -r ${PROJECT_SOURCE_DIR}/third_party/luajit/* .
COMMAND $(MAKE) clean COMMAND $(MAKE) ${luajit_buildoptions} clean
COMMAND $(MAKE) -C src ${luajit_buildoptions} libluajit.a COMMAND $(MAKE) -C src ${luajit_buildoptions} libluajit.a
DEPENDS ${PROJECT_BINARY_DIR}/CMakeCache.txt ${PROJECT_BINARY_DIR}/third_party/luajit DEPENDS ${PROJECT_BINARY_DIR}/CMakeCache.txt ${PROJECT_BINARY_DIR}/third_party/luajit
) )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment