From 91aec79128071c2067bc344bd0218e1dd91f56c0 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 25 Aug 2021 05:50:54 +0800 Subject: [tinyfiledialogs] Fix usage (#19723) * [tinyfiledialogs] Fix usage * Update version files --- ports/tinyfiledialogs/CMakeLists.txt | 2 +- ports/tinyfiledialogs/portfile.cmake | 1 - ports/tinyfiledialogs/vcpkg.json | 2 +- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/t-/tinyfiledialogs.json | 5 +++++ 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/tinyfiledialogs/CMakeLists.txt b/ports/tinyfiledialogs/CMakeLists.txt index cb48742a1..c4bbfd23b 100644 --- a/ports/tinyfiledialogs/CMakeLists.txt +++ b/ports/tinyfiledialogs/CMakeLists.txt @@ -25,5 +25,5 @@ export( install( EXPORT tinyfiledialogsConfig NAMESPACE tinyfiledialogs:: - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/tinyfiledialogs" + DESTINATION share/tinyfiledialogs ) diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index 2bc52913a..10929dec1 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -14,7 +14,6 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH} vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) vcpkg_cmake_install() diff --git a/ports/tinyfiledialogs/vcpkg.json b/ports/tinyfiledialogs/vcpkg.json index 1695d5007..6bc220ee0 100644 --- a/ports/tinyfiledialogs/vcpkg.json +++ b/ports/tinyfiledialogs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyfiledialogs", "version": "3.8.8", - "port-version": 2, + "port-version": 3, "description": "Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more", "homepage": "https://sourceforge.net/projects/tinyfiledialogs/", "supports": "!uwp", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1129af095..6943e87ad 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1539,8 +1539,6 @@ tinkerforge:arm-uwp=fail tinkerforge:x64-uwp=fail tinyexif:arm-uwp=fail tinyexif:x64-uwp=fail -tinyfiledialogs:arm-uwp=fail -tinyfiledialogs:x64-uwp=fail tiny-process-library:arm-uwp=fail tiny-process-library:x64-uwp=fail tmxlite:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 3ab5cc7e9..acc43183f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6338,7 +6338,7 @@ }, "tinyfiledialogs": { "baseline": "3.8.8", - "port-version": 2 + "port-version": 3 }, "tinygltf": { "baseline": "2020-07-28", diff --git a/versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json index 31ef037fb..709661158 100644 --- a/versions/t-/tinyfiledialogs.json +++ b/versions/t-/tinyfiledialogs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57a86420c47979e0b30dfb1e77482aad2836b07b", + "version": "3.8.8", + "port-version": 3 + }, { "git-tree": "abb5795ae7f012d210a4d98e4f072dea1b94c97a", "version": "3.8.8", -- cgit v1.2.3