diff --git a/dependencies/nlohmann_json/CMakeLists.txt b/dependencies/nlohmann_json/CMakeLists.txt index 3c6fa0b..b1db37d 100644 --- a/dependencies/nlohmann_json/CMakeLists.txt +++ b/dependencies/nlohmann_json/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(nlohmann_json INTERFACE) # Relative sources are allowed only since cmake 3.13. target_sources(nlohmann_json INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/json/json.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/nlohmann/json.hpp ) target_include_directories(nlohmann_json diff --git a/dependencies/nlohmann_json/json/json.hpp b/dependencies/nlohmann_json/nlohmann/json.hpp similarity index 100% rename from dependencies/nlohmann_json/json/json.hpp rename to dependencies/nlohmann_json/nlohmann/json.hpp diff --git a/src/applib/smartctl_json_ata_parser.cpp b/src/applib/smartctl_json_ata_parser.cpp index 2cf2838..8844968 100644 --- a/src/applib/smartctl_json_ata_parser.cpp +++ b/src/applib/smartctl_json_ata_parser.cpp @@ -20,7 +20,7 @@ Copyright: #include #include -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include "storage_property.h" #include "hz/debug.h" diff --git a/src/applib/smartctl_json_ata_parser.h b/src/applib/smartctl_json_ata_parser.h index 9fa0db0..b9ae4cc 100644 --- a/src/applib/smartctl_json_ata_parser.h +++ b/src/applib/smartctl_json_ata_parser.h @@ -16,7 +16,7 @@ Copyright: #include -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include "hz/error_container.h" #include "smartctl_parser_types.h" diff --git a/src/applib/smartctl_json_basic_parser.cpp b/src/applib/smartctl_json_basic_parser.cpp index 38dec75..415bfea 100644 --- a/src/applib/smartctl_json_basic_parser.cpp +++ b/src/applib/smartctl_json_basic_parser.cpp @@ -24,7 +24,7 @@ Copyright: #include "hz/string_algo.h" // string_* #include "hz/string_num.h" // string_is_numeric, number_to_string //#include "hz/debug.h" // debug_* -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include "hz/error_container.h" //#include "smartctl_text_ata_parser.h" diff --git a/src/applib/smartctl_json_basic_parser.h b/src/applib/smartctl_json_basic_parser.h index e843a3c..6046207 100644 --- a/src/applib/smartctl_json_basic_parser.h +++ b/src/applib/smartctl_json_basic_parser.h @@ -15,7 +15,7 @@ Copyright: //#include //#include -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include "smartctl_parser.h" diff --git a/src/applib/smartctl_json_nvme_parser.cpp b/src/applib/smartctl_json_nvme_parser.cpp index 0fe7a34..b06fc70 100644 --- a/src/applib/smartctl_json_nvme_parser.cpp +++ b/src/applib/smartctl_json_nvme_parser.cpp @@ -20,7 +20,7 @@ Copyright: #include #include -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include "storage_property.h" #include "hz/debug.h" diff --git a/src/applib/smartctl_json_nvme_parser.h b/src/applib/smartctl_json_nvme_parser.h index 62b8763..cb001ae 100644 --- a/src/applib/smartctl_json_nvme_parser.h +++ b/src/applib/smartctl_json_nvme_parser.h @@ -16,7 +16,7 @@ Copyright: #include -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include "hz/error_container.h" #include "smartctl_parser_types.h" diff --git a/src/applib/smartctl_json_parser_helpers.h b/src/applib/smartctl_json_parser_helpers.h index 532ea67..edcc46d 100644 --- a/src/applib/smartctl_json_parser_helpers.h +++ b/src/applib/smartctl_json_parser_helpers.h @@ -19,7 +19,7 @@ Copyright: #include #include -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include "hz/debug.h" #include "hz/string_algo.h" #include "smartctl_parser_types.h" diff --git a/src/rconfig/rconfig.h b/src/rconfig/rconfig.h index 9949dd6..6c5fd3e 100644 --- a/src/rconfig/rconfig.h +++ b/src/rconfig/rconfig.h @@ -12,7 +12,7 @@ Copyright: #ifndef RCONFIG_CONFIG_H #define RCONFIG_CONFIG_H -#include "json/json.hpp" +#include "nlohmann/json.hpp" #include #include