diff --git a/ports/volk/portfile.cmake b/ports/volk/portfile.cmake index e2083887df..fe58d79984 100644 --- a/ports/volk/portfile.cmake +++ b/ports/volk/portfile.cmake @@ -4,22 +4,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/volk - REF 5a605f5d6997bd929b666700a36ca3d9bd1d7a47 - SHA512 ed6faf13828f3e47c4f12f8d19952c94589420539e98405bf2a4b7959518357dcc2f210746f3683d3862ac8c80821f3c863d49f4625e2dac85d2a680567e4f00 + REF 1.3.204 + SHA512 73108aff5bed08f711730948c80070a8d913f2ba2e7886232cd981272fe47bc85cff84eabfdf14d4261c658b58ee098a9bd837222f65323f304d6abcdbeb8613 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DVOLK_INSTALL=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVOLK_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/volk) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/volk) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Put the file containing the license where vcpkg expects it -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/volk/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/volk/README.md ${CURRENT_PACKAGES_DIR}/share/volk/copyright) +file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/volk/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/volk/README.md" "${CURRENT_PACKAGES_DIR}/share/volk/copyright") diff --git a/ports/volk/vcpkg.json b/ports/volk/vcpkg.json index 3d3f4a1e64..32734f1285 100644 --- a/ports/volk/vcpkg.json +++ b/ports/volk/vcpkg.json @@ -1,14 +1,22 @@ { "name": "volk", - "version-string": "2019-09-26", - "port-version": 1, + "version": "1.3.204", "description": [ "Meta loader for Vulkan API.", "Note that the static library target volk::volk is built without platform-specific defines.", "Use the header-only target volk::volk_headers if you require platform-specific extensions." ], "homepage": "https://github.com/zeux/volk", + "license": "MIT", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "vulkan" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5d62a27ecd..809465e078 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7329,8 +7329,8 @@ "port-version": 2 }, "volk": { - "baseline": "2019-09-26", - "port-version": 1 + "baseline": "1.3.204", + "port-version": 0 }, "vs-yasm": { "baseline": "0.5.0", diff --git a/versions/v-/volk.json b/versions/v-/volk.json index 774ef5f91c..c5394f4549 100644 --- a/versions/v-/volk.json +++ b/versions/v-/volk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83175cabc17042125828c2e0230f75b60d140cc0", + "version": "1.3.204", + "port-version": 0 + }, { "git-tree": "0018a72c45ad8b5f9776d41ff067292b73cb7a31", "version-string": "2019-09-26",