vyn/selenite
1
Fork 0
mirror of https://codeberg.org/vyn/selenite.git synced 2025-07-01 09:13:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: vyn:810607c01fa659f31bd11bd41a9ee5611e5db8ea
Branches Tags
vyn:main
...
compare: vyn:6ff7dd8ea890bec8f4f61304e64bbfeabd61e7a8
Branches Tags
vyn:main

2 commits
810607c01f ... 6ff7dd8ea8

Author SHA1 Message Date
Vyn
6ff7dd8ea8
Remove duplicated cmake instructions 2025-06-24 17:27:15 +02:00
Vyn
f7fce6cf5a
Fix dependencies and cmake configuration 2025-06-24 17:23:36 +02:00
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cpp/CMakeLists.txt
View file

@ -2,17 +2,13 @@ cmake_minimum_required(VERSION 3.21)
project(selenite LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_EXPORT_COMPILE_COMMANDS 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_include_directories(selenite PRIVATE "include")
add_subdirectory(external/rei-json)
target_include_directories(selenite PRIVATE "external/rei-json/include")
target_link_libraries(selenite PRIVATE rei-json)
target_include_directories(selenite PRIVATE "include")
target_include_directories(selenite PRIVATE "external/rei-json/include")

2
cpp/external/rei-json vendored

@ -1 +1 @@
Subproject commit 2041a0aafe85085dcf35a37437db493898f1be3c
Subproject commit 63e7986b0901449657c3874ed7b19618315e9f01

4
cpp/src/palette.cpp
View file

@ -30,9 +30,9 @@ std::optional<Palette> parseJson(const std::string &path)
std::stringstream buffer;
buffer << file.rdbuf();
auto jsonStr = buffer.str();
auto jsonOpt = rei::json::parse(jsonStr);
auto json = std::get<rei::json::JsonObject>(jsonOpt);
auto json = jsonOpt.asObject();
/*if (!json.is_object() || !json["primary"].is_string() || !json["secondary"].is_string() ||*/
/*!json["background"].is_string() || !json["background2"].is_string() ||*/