mirror of https://github.com/microsoft/vcpkg.git
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h
|
|
index 15d984a3..ee122353 100644
|
|
--- a/Include/RmlUi/Config/Config.h
|
|
+++ b/Include/RmlUi/Config/Config.h
|
|
@@ -56,9 +56,9 @@
|
|
#include <set>
|
|
#include <unordered_set>
|
|
#else
|
|
- #include "../Core/Containers/itlib/flat_map.hpp"
|
|
- #include "../Core/Containers/itlib/flat_set.hpp"
|
|
- #include "../Core/Containers/robin_hood.h"
|
|
+ #include <itlib/flat_map.hpp>
|
|
+ #include <itlib/flat_set.hpp>
|
|
+ #include <robin_hood.h>
|
|
#endif // RMLUI_NO_THIRDPARTY_CONTAINERS
|
|
|
|
namespace Rml {
|
|
diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt
|
|
index 336ec979..c68131c8 100644
|
|
--- a/Source/Core/CMakeLists.txt
|
|
+++ b/Source/Core/CMakeLists.txt
|
|
@@ -239,9 +239,6 @@ target_sources(rmlui_core PRIVATE
|
|
"${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Colour.inl"
|
|
"${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/CompiledFilterShader.h"
|
|
"${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h"
|
|
- "${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_map.hpp"
|
|
- "${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_set.hpp"
|
|
- "${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h"
|
|
"${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h"
|
|
"${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h"
|
|
"${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h"
|
|
@@ -390,6 +387,11 @@ elseif(rmlui_core_TYPE STREQUAL "SHARED_LIBRARY")
|
|
endif()
|
|
unset(rmlui_core_TYPE)
|
|
|
|
+find_path(ROBIN_HOOD_INCLUDE_DIR robin_hood.h)
|
|
+target_include_directories(rmlui_core PUBLIC ${ROBIN_HOOD_INCLUDE_DIR})
|
|
+find_path(ITLIB_INCLUDE_DIRS "itlib/flat_map.hpp")
|
|
+target_include_directories(rmlui_core PUBLIC ${ITLIB_INCLUDE_DIRS})
|
|
+
|
|
if(RMLUI_FONT_ENGINE STREQUAL "freetype")
|
|
# Include the source files for the default font engine.
|
|
add_subdirectory("FontEngineDefault")
|