Syping/xmppbot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

GitHub Actions: Build with Ninja

Browse source
This commit is contained in:
Syping 2021-05-01 22:32:41 +02:00
parent cac1cd6940
commit 260d509f2e
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci/ubuntu_install.sh
View file

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
apt-get update -qq apt-get update -qq
apt-get install cmake git gcc g++ make qtbase5-dev -qq apt-get install cmake git gcc g++ make ninja-build qtbase5-dev -qq

2
.github/workflows/ubuntu.yml vendored
View file

@ -19,6 +19,6 @@ jobs:
- name: Install packages - name: Install packages
run: sudo .ci/ubuntu_install.sh run: sudo .ci/ubuntu_install.sh
- name: Configure CMake - name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED=OFF run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED=OFF -GNinja
- name: Build - name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

6
src/3rdparty/lua54/CMakeLists.txt vendored
View file

@ -71,9 +71,13 @@ target_include_directories(xmppbotlua PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(LUA_DEFINES -DLUA_USE_LINUX)
endif()
target_compile_definitions(xmppbotlua PUBLIC target_compile_definitions(xmppbotlua PUBLIC
-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_2
-DLUA_USE_LINUX ${LUA_DEFINES}
) )
target_link_libraries(xmppbotlua PUBLIC target_link_libraries(xmppbotlua PUBLIC