From 3ab85075df0295713dd212c5177a3531f15e5d24 Mon Sep 17 00:00:00 2001 From: Mutzi Date: Tue, 23 Apr 2024 16:27:57 +0200 Subject: [PATCH] Fixed CI --- .gitea/workflows/build.yaml | 2 +- CMakeLists.txt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 33c949b..c03de08 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -8,7 +8,7 @@ jobs: container: node:current-alpine steps: - - run: apk add git tar cmake make g++ linux-headers python3 xxd + - run: apk add git tar cmake make g++ linux-headers python3 xxd liburing-dev - uses: actions/checkout@v3 - run: npm ci working-directory: frontend diff --git a/CMakeLists.txt b/CMakeLists.txt index 65309ae..9d03219 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,10 @@ set(BOOST_LIBS function regex unordered iterator mpl conversion function_types fusion typeof functional ) +set(BOOST_SUPERPROJECT_VERSION 1.85.0) + foreach(BOOST_LIB ${BOOST_LIBS}) - CPMAddPackage("gh:boostorg/${BOOST_LIB}#boost-1.85.0") + CPMAddPackage("gh:boostorg/${BOOST_LIB}#boost-${BOOST_SUPERPROJECT_VERSION}") endforeach() CPMAddPackage( @@ -65,6 +67,7 @@ if(botan_ADDED) ) add_library(botan STATIC ${CMAKE_CURRENT_BINARY_DIR}/botan_all.cpp ${CMAKE_CURRENT_BINARY_DIR}/botan_all.h) + target_link_libraries(botan PUBLIC Boost::beast) endif() find_package(Threads REQUIRED) @@ -122,9 +125,9 @@ add_executable(fileserver favicon_svg.h ) -target_include_directories(fileserver PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(fileserver PRIVATE include ${CMAKE_CURRENT_BINARY_DIR} ${LIBURING_INCLUDE_DIR}) target_compile_options(fileserver PRIVATE -msse2) -target_compile_definitions(fileserver PRIVATE BOOST_BEAST_FILE_BUFFER_SIZE=65535) +target_compile_definitions(fileserver PRIVATE BOOST_BEAST_FILE_BUFFER_SIZE=65535 BOOST_ASIO_HAS_IO_URING) target_link_options(fileserver PRIVATE -static) target_link_libraries(fileserver PRIVATE spdlog::spdlog