mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 04:29:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
e99ac59ff3
vcpkg/ports/rmlui/add-robin-hood.patch

39 lines
1.5 KiB
Diff
Raw Normal View History

[rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com> * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com>
2021-07-02 01:25:42 +08:00
diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake
[rmlui] Update to version 5.1 (#30904)
2023-04-18 06:37:24 +08:00
index cd2918a7..f063a879 100644
[rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com> * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com>
2021-07-02 01:25:42 +08:00
--- a/CMake/FileList.cmake
+++ b/CMake/FileList.cmake
[rmlui] Update to version 5.1 (#30904)
2023-04-18 06:37:24 +08:00
@@ -123,7 +123,6 @@ set(Core_PUB_HDR_FILES
[rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com> * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com>
2021-07-02 01:25:42 +08:00
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h
[rmlui] Update to version 5.1 (#30904)
2023-04-18 06:37:24 +08:00
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_map.hpp
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_set.hpp
[rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com> * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com>
2021-07-02 01:25:42 +08:00
- ${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
[rmlui] Update to version 5.1 (#30904)
2023-04-18 06:37:24 +08:00
index 0b552524..190e8c8e 100644
[rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com> * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com>
2021-07-02 01:25:42 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[rmlui] Update to version 5.1 (#30904)
2023-04-18 06:37:24 +08:00
@@ -427,6 +427,8 @@ if( ENABLE_SVG_PLUGIN )
[rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com> * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com>
2021-07-02 01:25:42 +08:00
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
[rmlui] Update to version 5.1 (#30904)
2023-04-18 06:37:24 +08:00
index 018ab3b1..4bc20613 100644
[rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com> * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com>
2021-07-02 01:25:42 +08:00
--- a/Include/RmlUi/Config/Config.h
+++ b/Include/RmlUi/Config/Config.h
@@ -57,7 +57,7 @@
#else
[rmlui] Update to version 5.1 (#30904)
2023-04-18 06:37:24 +08:00
#include "../Core/Containers/itlib/flat_map.hpp"
#include "../Core/Containers/itlib/flat_set.hpp"
[rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com> * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat <noam-c@users.noreply.github.com>
2021-07-02 01:25:42 +08:00
-#include "../Core/Containers/robin_hood.h"
+#include <robin_hood.h>
#endif // RMLUI_NO_THIRDPARTY_CONTAINERS
namespace Rml {
Reference in New Issue Copy Permalink