[jxrlib] fix iOS build (#26506)

* [jxrlib] fix iOS build

* ./vcpkg x-add-version --all

* [jxrlib] fix deprecated functions, add license

* ./vcpkg x-add-version --all

* [jxrlib] fix absolute paths

* ./vcpkg x-add-version --all
This commit is contained in:
Russell Greene 2022-08-26 14:03:37 -05:00 committed by GitHub
parent 99d30139e9
commit 754cc25428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 13 deletions

View File

@ -8,28 +8,27 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
) )
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH})
if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux) if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES iOS)
# The file guiddef.h is part of the Windows SDK, # The file guiddef.h is part of the Windows SDK,
# we then remove the local copy shipped with jxrlib # we then remove the local copy shipped with jxrlib
file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h) file(REMOVE "${SOURCE_PATH}/common/include/guiddef.h")
endif() endif()
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
#install FindJXR.cmake file #install FindJXR.cmake file
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr")
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr")
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr")
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,14 @@
{ {
"name": "jxrlib", "name": "jxrlib",
"version": "2019.10.9", "version": "2019.10.9",
"port-version": 3, "port-version": 4,
"description": "Open source implementation of the jpegxr image format standard.", "description": "Open source implementation of the jpegxr image format standard.",
"homepage": "https://github.com/4creators/jxrlib" "homepage": "https://github.com/4creators/jxrlib",
"license": "BSD-2-Clause",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
} }

View File

@ -3170,7 +3170,7 @@
}, },
"jxrlib": { "jxrlib": {
"baseline": "2019.10.9", "baseline": "2019.10.9",
"port-version": 3 "port-version": 4
}, },
"kangaru": { "kangaru": {
"baseline": "4.3.0", "baseline": "4.3.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "faadd72c2d406fce9c076c025285aa692995a8b5",
"version": "2019.10.9",
"port-version": 4
},
{ {
"git-tree": "2070ec06331c3cf93574ec82fa22791e3ba6172f", "git-tree": "2070ec06331c3cf93574ec82fa22791e3ba6172f",
"version": "2019.10.9", "version": "2019.10.9",