diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 1cdd509..ca24554 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -3,12 +3,16 @@ project(selenite LANGUAGES CXX) set(CMAKE_CXX_STANDARD 23) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(CMAKE_COMPILE_WARNING_AS_ERROR ON) +#set(CMAKE_COMPILE_WARNING_AS_ERROR ON) set(CMAKE_BUILD_RPATH_USE_ORIGIN ON) +add_subdirectory(external/rei-json) + add_library(selenite src/palette.cpp ) +target_link_libraries(selenite PRIVATE rei-json) + target_include_directories(selenite PRIVATE "include") target_include_directories(selenite PRIVATE "external/rei-json/include") diff --git a/cpp/src/palette.cpp b/cpp/src/palette.cpp index af0d7ee..e42c6bd 100644 --- a/cpp/src/palette.cpp +++ b/cpp/src/palette.cpp @@ -34,14 +34,13 @@ std::optional parseJson(const std::string &path) auto jsonOpt = rei::json::parse(jsonStr); auto json = std::get(jsonOpt); - /*if (!json.is_object() || !json["primary"].is_string() || !json["secondary"].is_string() ||*/ - /*!json["background"].is_string() || !json["background2"].is_string() ||*/ - /*!json["background4"].is_string() || !json["background3"].is_string() ||*/ - /*!json["pane"].is_string() || !json["foreground"].is_string() ||*/ - /*!json["foregroundHint"].is_string() || !json["green"].is_string() ||*/ - /*!json["orange"].is_string() || !json["red"].is_string()) {*/ - /*return std::nullopt;*/ + /*!json["background"].is_string() || !json["background2"].is_string() ||*/ + /*!json["background4"].is_string() || !json["background3"].is_string() ||*/ + /*!json["pane"].is_string() || !json["foreground"].is_string() ||*/ + /*!json["foregroundHint"].is_string() || !json["green"].is_string() ||*/ + /*!json["orange"].is_string() || !json["red"].is_string()) {*/ + /*return std::nullopt;*/ /*}*/ Palette palette{