GitHub Actions: Build with Ninja
This commit is contained in:
parent
cac1cd6940
commit
260d509f2e
3 changed files with 7 additions and 3 deletions
|
@ -1,3 +1,3 @@
|
|||
#!/bin/bash
|
||||
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
2
.github/workflows/ubuntu.yml
vendored
|
@ -19,6 +19,6 @@ jobs:
|
|||
- name: Install packages
|
||||
run: sudo .ci/ubuntu_install.sh
|
||||
- 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
|
||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
|
||||
|
|
6
src/3rdparty/lua54/CMakeLists.txt
vendored
6
src/3rdparty/lua54/CMakeLists.txt
vendored
|
@ -71,9 +71,13 @@ target_include_directories(xmppbotlua PUBLIC
|
|||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set(LUA_DEFINES -DLUA_USE_LINUX)
|
||||
endif()
|
||||
|
||||
target_compile_definitions(xmppbotlua PUBLIC
|
||||
-DLUA_COMPAT_5_2
|
||||
-DLUA_USE_LINUX
|
||||
${LUA_DEFINES}
|
||||
)
|
||||
|
||||
target_link_libraries(xmppbotlua PUBLIC
|
||||
|
|
Loading…
Reference in a new issue