From e5cfe5f21564553a6e49e6b7d126f12e28b23020 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 28 Oct 2022 04:23:00 +0200 Subject: [PATCH] [plib] add supports expression (#27503) --- ports/plib/portfile.cmake | 15 +++++++-------- ports/plib/vcpkg.json | 14 +++++++++++--- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/p-/plib.json | 5 +++++ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ports/plib/portfile.cmake b/ports/plib/portfile.cmake index 1991b2f6be5d42..603aeb3ffe1616 100644 --- a/ports/plib/portfile.cmake +++ b/ports/plib/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/plib/vcpkg.json b/ports/plib/vcpkg.json index 421823aff3c706..4579c4a4685c70 100644 --- a/ports/plib/vcpkg.json +++ b/ports/plib/vcpkg.json @@ -1,6 +1,14 @@ { "name": "plib", - "version-string": "1.8.5", - "port-version": 5, - "description": "A suite of portable game libraries" + "version": "1.8.5", + "port-version": 6, + "description": "A suite of portable game libraries", + "license": "LGPL-2.0-only", + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5a970c5a4bd55c..d15e1f09c6d682 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -823,10 +823,6 @@ pfring:x64-linux=fail pixman:arm-uwp=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail -plib:arm-uwp=fail -plib:x64-osx=fail -plib:arm64-osx=fail -plib:x64-uwp=fail plibsys:arm-uwp=fail plibsys:x64-uwp=fail plplot:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 3c21c9eec6624a..33973187650044 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5786,7 +5786,7 @@ }, "plib": { "baseline": "1.8.5", - "port-version": 5 + "port-version": 6 }, "plibsys": { "baseline": "0.0.4", diff --git a/versions/p-/plib.json b/versions/p-/plib.json index 03df101ad2ec54..c77021e1cda00f 100644 --- a/versions/p-/plib.json +++ b/versions/p-/plib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df2cccd607d973a945593bfec6ef15bd7549e6c0", + "version": "1.8.5", + "port-version": 6 + }, { "git-tree": "7b00da126126e5e721ab3f6b1f931f7ec4df77f8", "version-string": "1.8.5",