From 4cabc2f42e8c605566fbc1237b60dcb452d1e696 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Sun, 19 Dec 2021 14:42:46 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20hot=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 10 +--------- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d3109c..3b8e852 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,31 +39,23 @@ FetchContent_Declare(ftxui GIT_REPOSITORY "https://github.com/arthursonzogni/ftxui.git" GIT_TAG "7e5cd23b4c47972b70b99c39617d6e38f05d1b3a" ) -FetchContent_MakeAvailable(ftxui) - FetchContent_Declare(spdlog GIT_REPOSITORY "https://github.com/gabime/spdlog.git" GIT_TAG "v1.9.2" ) -FetchContent_MakeAvailable(spdlog) - FetchContent_Declare(fmt GIT_REPOSITORY "https://github.com/fmtlib/fmt.git" GIT_TAG "3a951a66cb0fb53ff5a9d5ce9c77e05ef9d382ce" ) -FetchContent_MakeAvailable(fmt) - FetchContent_Declare(nlohmann_json GIT_REPOSITORY "https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent.git" GIT_TAG "v3.10.4" ) -FetchContent_MakeAvailable(nlohmann_json) - FetchContent_Declare(cpr GIT_REPOSITORY "https://github.com/libcpr/cpr.git" GIT_TAG "beb9e98806bb84bcc130a2cebfbcbbc6ce62b335" ) -FetchContent_MakeAvailable(cpr) +FetchContent_MakeAvailable(ftxui spdlog fmt nlohmann_json cpr) ## ## CONFIGURATION diff --git a/meson.build b/meson.build index 63d3e57..8584902 100644 --- a/meson.build +++ b/meson.build @@ -102,14 +102,14 @@ add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : executable( 'cachyos-installer', src_files, - dependencies: [fmt, spdlog, ftxui, nlohmann_json, cpr, glibmm], + dependencies: [fmt, spdlog, ftxui, cpr, glibmm], include_directories: [include_directories('src')], install: true) executable( 'test-exec-interactive', files('src/config.cpp', 'src/tui.cpp', 'src/utils.cpp', 'src/main_test.cpp'), - dependencies: [fmt, spdlog, ftxui, glibmm], + dependencies: [fmt, spdlog, ftxui, cpr, glibmm], include_directories: [include_directories('src')], install: false)