Skip to content

Commit 48ada6f

Browse files
cschreibcschreib
committed
Update dependencies
1 parent 7383238 commit 48ada6f

14 files changed

+298
-33
lines changed

‎.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
[submodule "sol2"]
1+
[submodule "extern/sol2"]
22
path = extern/sol2
3-
url = https://github.com/cschreib/sol2.git
4-
[submodule "utfcpp"]
3+
url = https://github.com/ThePhD/sol2.git
4+
[submodule "extern/utfcpp"]
55
path = extern/utfcpp
66
url = https://github.com/nemtrif/utfcpp.git
77
[submodule "fmt"]

‎CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,11 @@ if (LUA_VERSION_STRING VERSION_GREATER_EQUAL 5.1 AND LUA_VERSION_STRING VERSION_
188188
endif()
189189

190190
# add the subdirectories for dependencies
191-
set(UTF8_INSTALL 1)
192-
set(MAGIC_ENUM_OPT_INSTALL 1)
193191
add_subdirectory(extern/utfcpp)
192+
194193
add_subdirectory(extern/observable_unique_ptr)
194+
195+
set(MAGIC_ENUM_OPT_INSTALL 1)
195196
add_subdirectory(extern/magic_enum)
196197

197198
if(LXGUI_BUILD_FMT)
@@ -333,7 +334,7 @@ target_link_libraries(lxgui PUBLIC fmt::fmt)
333334
target_link_libraries(lxgui PUBLIC oup::oup)
334335
target_link_libraries(lxgui PUBLIC magic_enum::magic_enum)
335336
target_compile_definitions(lxgui PRIVATE -DUTF_CPP_CPLUSPLUS=201703L)
336-
target_link_libraries(lxgui PRIVATE utf8::cpp)
337+
target_link_libraries(lxgui PRIVATE utf8cpp)
337338
if(LXGUI_ENABLE_XML_PARSER)
338339
target_link_libraries(lxgui PRIVATE pugixml::pugixml)
339340
endif()
@@ -362,7 +363,7 @@ file(GLOB files ${PROJECT_SOURCE_DIR}/include/lxgui/*.hpp)
362363
install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lxgui)
363364
install(FILES "${PROJECT_BINARY_DIR}/lxgui/lxgui.hpp" DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lxgui)
364365

365-
set(LXGUI_INSTALL_TARGETS lxgui)
366+
set(LXGUI_INSTALL_TARGETS lxgui utf8cpp)
366367

367368
##############################################################################
368369
# Back-ends

‎extern/fmt

Submodule fmt updated 222 files

‎extern/magic_enum

Submodule magic_enum updated 64 files

‎extern/pugixml

Submodule pugixml updated 37 files

‎extern/rapidyaml

Submodule rapidyaml updated 303 files

‎extern/sol2

Submodule sol2 updated 452 files

‎extern/utfcpp

‎include/lxgui/gui_frame.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <limits>
1919
#include <list>
2020
#include <lxgui/extern_sol2_protected_function.hpp>
21-
#include <magic_enum.hpp>
21+
#include <magic_enum/magic_enum.hpp>
2222
#include <optional>
2323
#include <set>
2424
#include <unordered_map>

‎include/lxgui/gui_frame_renderer.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "lxgui/utils_sorted_vector.hpp"
99

1010
#include <functional>
11-
#include <magic_enum.hpp>
11+
#include <magic_enum/magic_enum.hpp>
1212

1313
namespace lxgui::gui {
1414

@@ -26,10 +26,10 @@ class frame_renderer {
2626
virtual ~frame_renderer() = default;
2727

2828
// Non-copiable, non-movable
29-
frame_renderer(const frame_renderer&) = delete;
30-
frame_renderer(frame_renderer&&) = delete;
29+
frame_renderer(const frame_renderer&) = delete;
30+
frame_renderer(frame_renderer&&) = delete;
3131
frame_renderer& operator=(const frame_renderer&) = delete;
32-
frame_renderer& operator=(frame_renderer&&) = delete;
32+
frame_renderer& operator=(frame_renderer&&) = delete;
3333

3434
/// Tells this renderer that one of its region requires redraw.
3535
virtual void notify_strata_needs_redraw(strata strata_id);

0 commit comments

Comments
 (0)