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

🚧 remove simdjson atm

Browse Source
This commit is contained in:
Vladislav Nepogodin 2022-03-08 16:29:52 +04:00
parent a55aee0e7c
commit a68a83582a
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -134,9 +134,9 @@ enable_sanitizers(project_options)
include_directories(${CMAKE_SOURCE_DIR}/src) include_directories(${CMAKE_SOURCE_DIR}/src)
target_link_libraries(${PROJECT_NAME} PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::screen ftxui::dom ftxui::component simdjson::simdjson cpr::cpr) target_link_libraries(${PROJECT_NAME} PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::screen ftxui::dom ftxui::component cpr::cpr)#simdjson::simdjson)
target_link_libraries(test-exec-interactive PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::component simdjson::simdjson cpr::cpr) target_link_libraries(test-exec-interactive PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::component cpr::cpr)#simdjson::simdjson)
target_link_libraries(test-process-tailing PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::component simdjson::simdjson cpr::cpr) target_link_libraries(test-process-tailing PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::component cpr::cpr)#simdjson::simdjson)
if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
target_link_libraries(${PROJECT_NAME} PRIVATE range-v3::range-v3) target_link_libraries(${PROJECT_NAME} PRIVATE range-v3::range-v3)

2
meson.build
View File

@ -120,7 +120,7 @@ endif
add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'cpp') add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'cpp')
deps = [fmt, spdlog, ftxui, simdjson, cpr] deps = [fmt, spdlog, ftxui, cpr]
if cc.get_id() == 'clang' if cc.get_id() == 'clang'
ranges = dependency('range-v3', version : ['>=0.11.0']) ranges = dependency('range-v3', version : ['>=0.11.0'])
deps += [ranges] deps += [ranges]

2
src/misc.cpp
View File

@ -19,7 +19,7 @@ namespace fs = std::filesystem;
namespace tui { namespace tui {
// Revised to deal with partion sizes now being displayed to the user // Revised to deal with partition sizes now being displayed to the user
bool confirm_mount([[maybe_unused]] const std::string_view& part_user) { bool confirm_mount([[maybe_unused]] const std::string_view& part_user) {
#ifdef NDEVENV #ifdef NDEVENV
const auto& ret_status = utils::exec(fmt::format(FMT_COMPILE("mount | grep {}"), part_user), true); const auto& ret_status = utils::exec(fmt::format(FMT_COMPILE("mount | grep {}"), part_user), true);

4
src/utils.cpp
View File

@ -47,6 +47,7 @@ namespace ranges = std::ranges;
#include <cpr/timeout.h> #include <cpr/timeout.h>
#endif #endif
/*
#if defined(__clang__) #if defined(__clang__)
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wsign-conversion"
@ -64,6 +65,7 @@ namespace ranges = std::ranges;
#elif defined(__GNUC__) #elif defined(__GNUC__)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
*/
namespace fs = std::filesystem; namespace fs = std::filesystem;
@ -724,6 +726,7 @@ vm.vfs_cache_pressure = 50
} }
void parse_config() noexcept { void parse_config() noexcept {
/*
using namespace simdjson; using namespace simdjson;
ondemand::parser parser; ondemand::parser parser;
@ -735,6 +738,7 @@ void parse_config() noexcept {
entry.get(step); entry.get(step);
// spdlog::debug(step); // spdlog::debug(step);
} }
*/
} }
void setup_luks_keyfile() noexcept { void setup_luks_keyfile() noexcept {