diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake index d975cdfe81ab83..56eea00cffd6b7 100644 --- a/ports/libui/portfile.cmake +++ b/ports/libui/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_TARGET_IS_MINGW) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andlabs/libui @@ -10,18 +14,16 @@ vcpkg_from_github( "003-fix-system-link.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libui TARGET_PATH share/unofficial-libui) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libui PACKAGE_NAME unofficial-libui) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libui/vcpkg.json b/ports/libui/vcpkg.json index 5d7ff38eb6924e..40140786a8651f 100644 --- a/ports/libui/vcpkg.json +++ b/ports/libui/vcpkg.json @@ -1,7 +1,23 @@ { "name": "libui", "version-date": "2018-11-03", - "port-version": 2, + "port-version": 3, "description": "Simple and portable (but not inflexible) native GUI library in C.", - "homepage": "https://github.com/andlabs/libui" + "homepage": "https://github.com/andlabs/libui", + "license": "MIT", + "supports": "!android & !emscripten & !ios & !uwp", + "dependencies": [ + { + "name": "gtk3", + "platform": "!windows & !osx" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 43a168388bf37a..89e799404b5eff 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -518,9 +518,6 @@ libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm-uwp=fail -libui:arm-uwp=fail -libui:x64-linux=fail -libui:x64-uwp=fail libusb:arm-uwp=fail libusb:x64-uwp=fail libusb:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index fb48a37c8952b0..a67701a07f3291 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4274,7 +4274,7 @@ }, "libui": { "baseline": "2018-11-03", - "port-version": 2 + "port-version": 3 }, "libunibreak": { "baseline": "5.0", diff --git a/versions/l-/libui.json b/versions/l-/libui.json index 2c5c16298a5f3e..15e4599ca71a8e 100644 --- a/versions/l-/libui.json +++ b/versions/l-/libui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2eac6098c733ccc84e2c69092ac8cfd6499af3be", + "version-date": "2018-11-03", + "port-version": 3 + }, { "git-tree": "941bfc035a8cfa6020be3475769732b027249a1d", "version-date": "2018-11-03",