Clone/New-Cli-Installer
1
0
Fork 0
mirror of https://github.com/CachyOS/New-Cli-Installer.git synced 2025-01-23 22:42:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🚧 hot fix

Browse Source
This commit is contained in:
Vladislav Nepogodin 2021-12-19 14:42:46 +04:00
parent 2d05a6a106
commit 4cabc2f42e
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -39,31 +39,23 @@ FetchContent_Declare(ftxui
GIT_REPOSITORY "https://github.com/arthursonzogni/ftxui.git" GIT_REPOSITORY "https://github.com/arthursonzogni/ftxui.git"
GIT_TAG "7e5cd23b4c47972b70b99c39617d6e38f05d1b3a" GIT_TAG "7e5cd23b4c47972b70b99c39617d6e38f05d1b3a"
) )
FetchContent_MakeAvailable(ftxui)
FetchContent_Declare(spdlog FetchContent_Declare(spdlog
GIT_REPOSITORY "https://github.com/gabime/spdlog.git" GIT_REPOSITORY "https://github.com/gabime/spdlog.git"
GIT_TAG "v1.9.2" GIT_TAG "v1.9.2"
) )
FetchContent_MakeAvailable(spdlog)
FetchContent_Declare(fmt FetchContent_Declare(fmt
GIT_REPOSITORY "https://github.com/fmtlib/fmt.git" GIT_REPOSITORY "https://github.com/fmtlib/fmt.git"
GIT_TAG "3a951a66cb0fb53ff5a9d5ce9c77e05ef9d382ce" GIT_TAG "3a951a66cb0fb53ff5a9d5ce9c77e05ef9d382ce"
) )
FetchContent_MakeAvailable(fmt)
FetchContent_Declare(nlohmann_json FetchContent_Declare(nlohmann_json
GIT_REPOSITORY "https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent.git" GIT_REPOSITORY "https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent.git"
GIT_TAG "v3.10.4" GIT_TAG "v3.10.4"
) )
FetchContent_MakeAvailable(nlohmann_json)
FetchContent_Declare(cpr FetchContent_Declare(cpr
GIT_REPOSITORY "https://github.com/libcpr/cpr.git" GIT_REPOSITORY "https://github.com/libcpr/cpr.git"
GIT_TAG "beb9e98806bb84bcc130a2cebfbcbbc6ce62b335" GIT_TAG "beb9e98806bb84bcc130a2cebfbcbbc6ce62b335"
) )
FetchContent_MakeAvailable(cpr) FetchContent_MakeAvailable(ftxui spdlog fmt nlohmann_json cpr)
## ##
## CONFIGURATION ## CONFIGURATION

4
meson.build
View File

@ -102,14 +102,14 @@ add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language :
executable( executable(
'cachyos-installer', 'cachyos-installer',
src_files, src_files,
dependencies: [fmt, spdlog, ftxui, nlohmann_json, cpr, glibmm], dependencies: [fmt, spdlog, ftxui, cpr, glibmm],
include_directories: [include_directories('src')], include_directories: [include_directories('src')],
install: true) install: true)
executable( executable(
'test-exec-interactive', 'test-exec-interactive',
files('src/config.cpp', 'src/tui.cpp', 'src/utils.cpp', 'src/main_test.cpp'), 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')], include_directories: [include_directories('src')],
install: false) install: false)