From 1905bab927f724662861ccd169a57a5afbb1fad0 Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Mon, 2 Mar 2026 15:20:58 +0200 Subject: [PATCH] fixes cmake configuration --- CMakeLists.txt | 23 +++++++++++++++++++++++ src/CMakeLists.txt | 18 ------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 977b763..c327553 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,29 @@ project(ZBBSServer VERSION 1.0.0 ) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +if( + (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR + (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +) + add_compile_definitions(_GNU_SOURCE) +endif() + +find_package(PostgreSQL REQUIRED) +if(NOT PostgreSQL_FOUND) + message(FATAL_ERROR "PostgreSQL not found. Please install libpq-dev or set PostgreSQL_ROOT.") +endif() + +find_package(OpenSSL REQUIRED) +if(NOT OpenSSL_FOUND) + message(FATAL_ERROR "OpenSSL not found. Please install libcrypto or set OpenSSL_ROOT.") +endif() + + +set(CURSES_NEED_NCURSES TRUE) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + add_subdirectory(src) install( diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 055906d..c66fa67 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,29 +2,11 @@ add_executable(zbbs-server) set_property(TARGET zbbs-server PROPERTY C_STANDARD 23) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - -find_package(PostgreSQL REQUIRED) -if(NOT PostgreSQL_FOUND) - message(FATAL_ERROR "PostgreSQL not found. Please install libpq-dev or set PostgreSQL_ROOT.") -endif() - -find_package(OpenSSL REQUIRED) -if(NOT OpenSSL_FOUND) - message(FATAL_ERROR "OpenSSL not found. Please install libcrypto or set OpenSSL_ROOT.") -endif() - -file(GLOB M_HEADERS "*.h") file(GLOB M_SOURCES "*.c") target_sources(zbbs-server PRIVATE ${M_SOURCES} - PUBLIC - FILE_SET HEADERS - FILES - ${M_HEADERS} - "types.h" ) add_subdirectory(libs)