diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index 493c002fcc..78e40c19a0 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -1,68 +1,68 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mikke89/RmlUi - REF ${VERSION} - SHA512 f08c126d3727850724072fb88b1c95cb6c5dcc160082bffcba42d2236950b651e39d71f7c0eecf5a5a047f68ad5cc7f1968d2334c5b72c019d2aefb3fb55e246 - HEAD_REF master - PATCHES - add-itlib-and-robin-hood.patch - skip-custom-find-modules.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - lua RMLUI_LUA_BINDINGS - svg RMLUI_SVG_PLUGIN - lottie RMLUI_LOTTIE_PLUGIN -) - -if("freetype" IN_LIST FEATURES) - set(RMLUI_FONT_ENGINE "freetype") -else() - set(RMLUI_FONT_ENGINE "none") -endif() - -# Remove built-in third-party dependencies (itlib and robin-hood), instead we use vcpkg ports. -file(REMOVE_RECURSE "${SOURCE_PATH}/Include/RmlUi/Core/Containers") - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${FEATURE_OPTIONS} - "-DRMLUI_FONT_ENGINE=${RMLUI_FONT_ENGINE}" - "-DRMLUI_COMPILER_OPTIONS=OFF" - "-DRMLUI_INSTALL_RUNTIME_DEPENDENCIES=OFF" -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RmlUi) -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/RmlUi/Core/Header.h" - "#if !defined RMLUI_STATIC_LIB" - "#if 0" - ) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/RmlUi/Debugger/Header.h" - "#if !defined RMLUI_STATIC_LIB" - "#if 0" - ) - if ("lua" IN_LIST FEATURES) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/RmlUi/Lua/Header.h" - "#if !defined RMLUI_STATIC_LIB" - "#if 0" - ) - endif() -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) -vcpkg_install_copyright( - FILE_LIST - "${SOURCE_PATH}/LICENSE.txt" - "${SOURCE_PATH}/Source/Debugger/LICENSE.txt" -) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mikke89/RmlUi + REF ${VERSION} + SHA512 b66d2a3621ca2690d6e826661203fc3a4babe16243ed01b2f884d149f5b7ee598241f1f743262c7a8fbf8ae98641d5c5526fc63d8a6283638b6dc021d23e103e + HEAD_REF master + PATCHES + add-itlib-and-robin-hood.patch + skip-custom-find-modules.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lua RMLUI_LUA_BINDINGS + svg RMLUI_SVG_PLUGIN + lottie RMLUI_LOTTIE_PLUGIN +) + +if("freetype" IN_LIST FEATURES) + set(RMLUI_FONT_ENGINE "freetype") +else() + set(RMLUI_FONT_ENGINE "none") +endif() + +# Remove built-in third-party dependencies (itlib and robin-hood), instead we use vcpkg ports. +file(REMOVE_RECURSE "${SOURCE_PATH}/Include/RmlUi/Core/Containers") + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + "-DRMLUI_FONT_ENGINE=${RMLUI_FONT_ENGINE}" + "-DRMLUI_COMPILER_OPTIONS=OFF" + "-DRMLUI_INSTALL_RUNTIME_DEPENDENCIES=OFF" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RmlUi) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/RmlUi/Core/Header.h" + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/RmlUi/Debugger/Header.h" + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + if ("lua" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/RmlUi/Lua/Header.h" + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + endif() +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE.txt" + "${SOURCE_PATH}/Source/Debugger/LICENSE.txt" +) diff --git a/ports/rmlui/usage b/ports/rmlui/usage index f542f083ea..f95a04f27c 100644 --- a/ports/rmlui/usage +++ b/ports/rmlui/usage @@ -1,4 +1,4 @@ -rmlui provides CMake targets: - - find_package(RmlUi CONFIG REQUIRED) - target_link_libraries(main PRIVATE RmlUi::RmlUi) +rmlui provides CMake targets: + + find_package(RmlUi CONFIG REQUIRED) + target_link_libraries(main PRIVATE RmlUi::RmlUi) diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json index 938ac9b0a0..3446b3b34a 100644 --- a/ports/rmlui/vcpkg.json +++ b/ports/rmlui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rmlui", - "version": "6.2", + "version": "6.3", "maintainers": "Michael R. P. Ragazzon ", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 9c275cf172..1e9fa5cb88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8937,7 +8937,7 @@ "port-version": 0 }, "rmlui": { - "baseline": "6.2", + "baseline": "6.3", "port-version": 0 }, "rmqcpp": { diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index 4e60fafea6..860b175717 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "190d18bbd429a7eab3a01d54051362e47538bfb0", + "version": "6.3", + "port-version": 0 + }, { "git-tree": "29b67cb822e000a5369d477689145c7df434f842", "version": "6.2",