From b8f9fc6d503cb64d3441a0ddfcfa64472d4a4502 Mon Sep 17 00:00:00 2001 From: Alberto Miranda Date: Mon, 30 Oct 2023 16:21:18 +0100 Subject: [PATCH] [CMake] Remove dependency on `libconfig` Fixes #22 --- CMakeLists.txt | 3 --- docker/0.3.0-wip/Dockerfile | 1 - src/CMakeLists.txt | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 129a04a..d5fade9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,9 +286,6 @@ target_include_directories(asio INTERFACE ${asio_SOURCE_DIR}/asio/include) target_link_libraries(asio INTERFACE Threads::Threads) add_library(asio::asio ALIAS asio) - -pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9) - if (CARGO_BUILD_TESTS) enable_testing() diff --git a/docker/0.3.0-wip/Dockerfile b/docker/0.3.0-wip/Dockerfile index 53b3b4e..6949d16 100644 --- a/docker/0.3.0-wip/Dockerfile +++ b/docker/0.3.0-wip/Dockerfile @@ -22,7 +22,6 @@ RUN set -ex \ boost-openmpi-devel \ json-c-devel \ openmpi-devel \ - libconfig-devel \ # install cmake 3.21+ since we need to produce JUnit XML files && curl -OL https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-Linux-x86_64.sh \ && chmod u+x ./cmake-3.27.6-Linux-x86_64.sh \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab210a2..ff1a5c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -65,8 +65,7 @@ target_include_directories( target_link_libraries( cargo_server - PRIVATE config - rpc_server + PRIVATE rpc_server cargo fmt::fmt MPI::MPI_CXX -- GitLab