From e28b7a8e671fba6fd1a9356afdc91c1ec74c59f1 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Sun, 18 Dec 2022 18:35:13 +0300 Subject: [PATCH] Fix rapidjson dependence --- libs/ui/CMakeLists.txt | 2 +- libs/ui/source/bmfont.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt index bf07791a..289a4fbf 100644 --- a/libs/ui/CMakeLists.txt +++ b/libs/ui/CMakeLists.txt @@ -3,7 +3,7 @@ file(GLOB_RECURSE PSEMEK_UI_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "sour psemek_add_library(psemek-ui ${PSEMEK_UI_HEADERS} ${PSEMEK_UI_SOURCES}) target_include_directories(psemek-ui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(psemek-ui PUBLIC psemek-util psemek-log psemek-geom psemek-cg psemek-gfx psemek-async psemek-sdl2) +target_link_libraries(psemek-ui PUBLIC psemek-util psemek-log psemek-geom psemek-cg psemek-gfx psemek-async psemek-sdl2 rapidjson) psemek_glob_resources(psemek-ui resources psemek/ui/resources) diff --git a/libs/ui/source/bmfont.cpp b/libs/ui/source/bmfont.cpp index d40db2ee..7b9c7bdc 100644 --- a/libs/ui/source/bmfont.cpp +++ b/libs/ui/source/bmfont.cpp @@ -4,6 +4,7 @@ #include #define RAPIDJSON_ASSERT(x) if (!(x)) throw ::std::runtime_error("Error parsing font description: " BOOST_PP_STRINGIZE(x)); +#define RAPIDJSON_NOEXCEPT_ASSERT(x) #include #include