diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index a15541b9964..cdfe1fd1c79 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -8,28 +8,27 @@ vcpkg_from_github( 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, # 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() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) #install FindJXR.cmake file -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}/usage 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}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") # 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) diff --git a/ports/jxrlib/vcpkg.json b/ports/jxrlib/vcpkg.json index bdd2c9eb1e5..5e350632995 100644 --- a/ports/jxrlib/vcpkg.json +++ b/ports/jxrlib/vcpkg.json @@ -1,7 +1,14 @@ { "name": "jxrlib", "version": "2019.10.9", - "port-version": 3, + "port-version": 4, "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 + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index db673c18e58..08bc2e3d7c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3170,7 +3170,7 @@ }, "jxrlib": { "baseline": "2019.10.9", - "port-version": 3 + "port-version": 4 }, "kangaru": { "baseline": "4.3.0", diff --git a/versions/j-/jxrlib.json b/versions/j-/jxrlib.json index 4995aa67e2a..9689aa86e1f 100644 --- a/versions/j-/jxrlib.json +++ b/versions/j-/jxrlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faadd72c2d406fce9c076c025285aa692995a8b5", + "version": "2019.10.9", + "port-version": 4 + }, { "git-tree": "2070ec06331c3cf93574ec82fa22791e3ba6172f", "version": "2019.10.9",