forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[rmlui] Update to version 6.0 (microsoft#40666)
- Loading branch information
Showing
8 changed files
with
92 additions
and
178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,35 @@ | ||
| diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake | ||
| index cd2918a7..f063a879 100644 | ||
| --- a/CMake/FileList.cmake | ||
| +++ b/CMake/FileList.cmake | ||
| @@ -123,7 +123,6 @@ set(Core_PUB_HDR_FILES | ||
| ${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 | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 0b552524..190e8c8e 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -427,6 +427,8 @@ if( ENABLE_SVG_PLUGIN ) | ||
| message("-- Can SVG plugin be enabled - yes - lunasvg library found") | ||
| endif() | ||
|
|
||
| +find_path(ROBIN_HOOD_INCLUDE_DIR robin_hood.h) | ||
| +include_directories(${ROBIN_HOOD_INCLUDE_DIR}) | ||
|
|
||
| if(NOT BUILD_FRAMEWORK) | ||
| #=================================== | ||
| diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h | ||
| index 018ab3b1..4bc20613 100644 | ||
| index 15d984a3..019db32c 100644 | ||
| --- a/Include/RmlUi/Config/Config.h | ||
| +++ b/Include/RmlUi/Config/Config.h | ||
| @@ -57,7 +57,7 @@ | ||
| #else | ||
| #include "../Core/Containers/itlib/flat_map.hpp" | ||
| #include "../Core/Containers/itlib/flat_set.hpp" | ||
| -#include "../Core/Containers/robin_hood.h" | ||
| +#include <robin_hood.h> | ||
| #endif // RMLUI_NO_THIRDPARTY_CONTAINERS | ||
| @@ -58,7 +58,7 @@ | ||
| #else | ||
| #include "../Core/Containers/itlib/flat_map.hpp" | ||
| #include "../Core/Containers/itlib/flat_set.hpp" | ||
| - #include "../Core/Containers/robin_hood.h" | ||
| + #include <robin_hood.h> | ||
| #endif // RMLUI_NO_THIRDPARTY_CONTAINERS | ||
|
|
||
| namespace Rml { | ||
| diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt | ||
| index c377ff49..7dff6a07 100644 | ||
| --- a/Source/Core/CMakeLists.txt | ||
| +++ b/Source/Core/CMakeLists.txt | ||
| @@ -233,7 +233,6 @@ target_sources(rmlui_core PRIVATE | ||
| "${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" | ||
| @@ -379,6 +378,9 @@ 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}) | ||
| + | ||
| if(RMLUI_FONT_ENGINE STREQUAL "freetype") | ||
| # Include the source files for the default font engine. | ||
| add_subdirectory("FontEngineDefault") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| diff --git a/CMake/RmlUiConfig.cmake.in b/CMake/RmlUiConfig.cmake.in | ||
| index a69348fd..9d758860 100644 | ||
| --- a/CMake/RmlUiConfig.cmake.in | ||
| +++ b/CMake/RmlUiConfig.cmake.in | ||
| @@ -27,8 +27,6 @@ macro(report_dependency_found_or_error friendly_name target_name) | ||
| message(STATUS "Found ${friendly_name} target ${target_name}${success_message}") | ||
| endmacro() | ||
|
|
||
| -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules") | ||
| - | ||
| include("${CMAKE_CURRENT_LIST_DIR}/Dependencies.cmake") | ||
|
|
||
| include("${CMAKE_CURRENT_LIST_DIR}/RmlUiTargets.cmake") | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index f13434fc..2aef42fb 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -189,9 +189,6 @@ install(FILES | ||
| DESTINATION | ||
| "${RMLUI_INSTALL_TARGETS_DIR}" | ||
| ) | ||
| -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules" | ||
| - DESTINATION "${RMLUI_INSTALL_TARGETS_DIR}" | ||
| -) | ||
|
|
||
| if(RMLUI_IS_ROOT_PROJECT) | ||
| # Export build tree targets if RmlUi is the top-level project. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| rmlui provides CMake targets: | ||
|
|
||
| find_package(RmlUi CONFIG REQUIRED) | ||
| target_link_libraries(main PRIVATE RmlUi::RmlUi) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| { | ||
| "name": "rmlui", | ||
| "version": "5.1", | ||
| "port-version": 1, | ||
| "version": "6.0", | ||
| "maintainers": "Michael R. P. Ragazzon <[email protected]>", | ||
| "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", | ||
| "homepage": "https://github.com/mikke89/RmlUi", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters