diff options
| author | Cara Salter <cara@devcara.com> | 2023-04-21 14:52:22 -0400 |
|---|---|---|
| committer | Cara Salter <cara@devcara.com> | 2023-04-23 13:59:53 -0400 |
| commit | 6c16d4315b5d97316db25b5a79ccee8fa1d4e953 (patch) | |
| tree | c34a9c39c07dcd2645534675657c6c2c73c2f507 | |
| parent | e3aeb94c0e8cb920022d67e59911e2917c4a5b78 (diff) | |
| download | 142bot-6c16d4315b5d97316db25b5a79ccee8fa1d4e953.tar.gz 142bot-6c16d4315b5d97316db25b5a79ccee8fa1d4e953.zip | |
build: Update CMakeLists
Start using find_package to find system packages rather than always depending on building them ourselves
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 22b9ef7..417cb4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 3.0) project(onefortytwobot VERSION 0.3 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) include(FetchContent) FetchContent_Declare(clog @@ -12,10 +17,12 @@ FetchContent_Declare(clog 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) # The commit hash for 1.9.0. Replace with the latest from: https://github.com/libcpr/cpr/releases + 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) @@ -23,6 +30,7 @@ FetchContent_Declare(fmt GIT_REPOSITORY https://github.com/fmtlib/fmt FetchContent_Declare(spdlog GIT_REPOSITORY https://github.com/gabime/spdlog GIT_TAG v1.1.0 + FIND_PACKAGE_ARGS NAMES spdlog ) FetchContent_Declare(sentry @@ -51,7 +59,7 @@ 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 dpp cpr fmt spdlog) +add_dependencies(142bot clog cpr fmt) install(TARGETS 142bot) @@ -63,7 +71,7 @@ foreach (fullmodname ${subdirlist}) set (modsrc "") aux_source_directory(${modules_dir}/${modname} modsrc) add_library(module_${modname} SHARED ${modsrc}) - add_dependencies(module_${modname} dpp cpr spdlog fmt) + add_dependencies(module_${modname} cpr fmt) target_link_libraries(module_${modname} dpp cpr sentry) set_target_properties(module_${modname} PROPERTIES PREFIX "") endforeach(fullmodname) |