diff options
| author | Cara Salter <cara@devcara.com> | 2023-05-31 20:15:08 -0400 |
|---|---|---|
| committer | Cara Salter <cara@devcara.com> | 2023-05-31 20:15:08 -0400 |
| commit | e09e7825369ec8217456065d31dbbbb992b7f1bb (patch) | |
| tree | 37cfbc3b756f75fd6fc446090c18e4ea3464562e /CMakeLists.txt | |
| parent | 31e862b7a4c5c1af9a8b331853d6bc01c49f2816 (diff) | |
| download | 142bot-e09e7825369ec8217456065d31dbbbb992b7f1bb.tar.gz 142bot-e09e7825369ec8217456065d31dbbbb992b7f1bb.zip | |
meta: Use system libraries to compile0.5
Also: try to make pqxx not use local socket for connections
(unsuccessful)
Change-Id: I351fe1a405a7c204e1276a90da75ab3d32f51bdc
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 45 |
1 files changed, 8 insertions, 37 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e5159b6..ffbe96a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,44 +1,17 @@ cmake_minimum_required(VERSION 3.0) -project(onefortytwobot VERSION 0.4 LANGUAGES CXX C) +project(onefortytwobot VERSION 0.5 LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 20 REQUIRED) set(FETCHCONTENT_TRY_FIND_PACKAGE_MODE OPT_IN) -find_package(spdlog) -find_package(dpp) -#find_package(cpr REQUIRED) +list(APPEND CMAKE_MODULE_PATH + "${CMAKE_SOURCE_DIR}/cmake") -include(FetchContent) -FetchContent_Declare(clog - GIT_REPOSITORY https://git.devcara.com/clog - GIT_TAG 0.1.0 -) - -FetchContent_Declare(dpp - GIT_REPOSITORY https://github.com/brainboxdotcc/DPP - GIT_TAG v10.0.23 - FIND_PACKAGE_ARGS -) - -FetchContent_Declare(cpr GIT_REPOSITORY https://github.com/libcpr/cpr.git - GIT_TAG 871ed52d350214a034f6ef8a3b8f51c5ce1bd400 - FIND_PACKAGE_ARGS) # The commit hash for 1.9.0. Replace with the latest from: https://github.com/libcpr/cpr/releases - -FetchContent_Declare(fmt GIT_REPOSITORY https://github.com/fmtlib/fmt - GIT_TAG 9.1.0) - -FetchContent_Declare(spdlog - GIT_REPOSITORY https://github.com/gabime/spdlog - GIT_TAG v1.1.0 - FIND_PACKAGE_ARGS NAMES spdlog - ) - -FetchContent_Declare(sentry - GIT_REPOSITORY https://github.com/getsentry/sentry-native - GIT_TAG 0.6.1 -) - -FetchContent_MakeAvailable(clog dpp cpr fmt spdlog sentry) +find_package(spdlog REQUIRED) +find_package(dpp REQUIRED) +find_package(cpr REQUIRED) +find_package(sentry REQUIRED) +find_package(curl) include(cmake/FindPCRE.cmake) @@ -59,7 +32,6 @@ add_executable(142bot ${coresrc}) include_directories("include" ${PROJECT_BINARY_DIR}) target_link_libraries(142bot PRIVATE clog dpp fmt::fmt spdlog::spdlog pcre cpr::cpr ${PQXX_LIB} ${PQ_LIB} sentry) -add_dependencies(142bot clog cpr fmt) install(TARGETS 142bot) @@ -71,7 +43,6 @@ foreach (fullmodname ${subdirlist}) set (modsrc "") aux_source_directory(${modules_dir}/${modname} modsrc) add_library(module_${modname} SHARED ${modsrc}) - add_dependencies(module_${modname} cpr fmt) target_link_libraries(module_${modname} dpp cpr sentry) set_target_properties(module_${modname} PROPERTIES PREFIX "") endforeach(fullmodname) |