Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[plib] add supports expression #27503

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions ports/plib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
14 changes: 11 additions & 3 deletions ports/plib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
4 changes: 0 additions & 4 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -822,10 +822,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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5786,7 +5786,7 @@
},
"plib": {
"baseline": "1.8.5",
"port-version": 5
"port-version": 6
},
"plibsys": {
"baseline": "0.0.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/plib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "df2cccd607d973a945593bfec6ef15bd7549e6c0",
"version": "1.8.5",
"port-version": 6
},
{
"git-tree": "7b00da126126e5e721ab3f6b1f931f7ec4df77f8",
"version-string": "1.8.5",
Expand Down