From 4a5fb9c6c66b998835688de1710e116b75311b2e Mon Sep 17 00:00:00 2001 From: parovoz Date: Mon, 24 Feb 2025 20:50:52 +0400 Subject: [PATCH] fcgi --- .gitea/workflows/build.yaml | 10 +++++----- CMakeLists.txt | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index aa775db..a3a7d4d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -23,19 +23,19 @@ jobs: run: ~/stop.sh fourier || echo service was not started - name: clear old installation - run: xargs rm < ~/build/install_manifest.txt || echo previous installation not found + run: xargs rm < ~/build/fourier/install_manifest.txt || echo previous installation not found - name: clear old builddir - run: rm -rf ~/build || echo previous installation not found + run: rm -rf ~/build/fourier || echo previous installation not found - name: Configure CMake - run: cmake -B ~/build -DCMAKE_INSTALL_PREFIX=~/.local + run: cmake -B ~/build/fourier -DCMAKE_INSTALL_PREFIX=~/.local - name: Build - run: cmake --build ~/build + run: cmake --build ~/build/fourier - name: install - run: make -C ~/build install + run: make -C ~/build/fourier install - name: Start server run: ~/start.sh fourier diff --git a/CMakeLists.txt b/CMakeLists.txt index d771ba6..cdd13f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(Wt REQUIRED Wt - HTTP + FCGI ) include(GNUInstallDirs) @@ -22,27 +22,27 @@ add_executable(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} Wt::Wt - Wt::HTTP + Wt::FCGI ) -configure_file( - run.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wt -) +# configure_file( +# run.sh.in +# ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wt +# ) install( TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -install( FILES wt_config.xml DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}) +# install( FILES wt_config.xml DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wt - DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE -) +# install( +# FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wt +# DESTINATION ${CMAKE_INSTALL_BINDIR} +# PERMISSIONS +# OWNER_READ OWNER_WRITE OWNER_EXECUTE +# GROUP_READ GROUP_EXECUTE +# WORLD_READ WORLD_EXECUTE +# )