File tree Expand file tree Collapse file tree 6 files changed +2409
-534
lines changed Expand file tree Collapse file tree 6 files changed +2409
-534
lines changed Original file line number Diff line number Diff line change 11sudo : required
2- dist : trusty
2+ dist : Focal
33
44os : linux
55
@@ -17,6 +17,7 @@ addons:
1717 - libipc-run3-perl
1818 - lua5.1
1919 - lua5.1-dev
20+ - cmake
2021
2122cache :
2223 apt : true
3031 - LUAJIT=1 LUA_DIR=/usr/local LUA_INCLUDE_DIR=$LUA_DIR/include/luajit-2.1 LUA_SUFFIX=--lua-suffix=jit
3132
3233install :
34+ - sudo ln -s /usr/bin/cmake /usr/local/bin/cmake
3335 - if [ -n "$LUAJIT" ]; then git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git; fi
3436 - if [ -n "$LUAJIT" ]; then cd ./luajit2; fi
3537 - if [ -n "$LUAJIT" ]; then make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1); fi
@@ -53,3 +55,9 @@ script:
5355 - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1; export e=$?
5456 - cat build.log
5557 - grep -E '^==[0-9]+==' build.log; if [ "$?" == 0 ]; then exit 1; else exit $e; fi
58+ - cmake -DUSE_INTERNAL_FPCONV=1 .
59+ - make
60+ - prove -Itests tests
61+ - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1; export e=$?
62+ - cat build.log
63+ - grep -E '^==[0-9]+==' build.log; if [ "$?" == 0 ]; then exit 1; else exit $e; fi
Original file line number Diff line number Diff line change 44# Windows: set LUA_DIR=c:\lua51
55
66project (lua-cjson C)
7- cmake_minimum_required (VERSION 2.6 )
7+ cmake_minimum_required (VERSION 2.8.12 )
88
99option (USE_INTERNAL_FPCONV "Use internal strtod() / g_fmt() code for performance" )
1010option (MULTIPLE_THREADS "Support multi-threaded apps with internal fpconv - recommended" ON )
You can’t perform that action at this time.
0 commit comments