diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
| commit | 1908903508bf057ad05d8a344e5bc55477944cb6 (patch) | |
| tree | 2a23595f1e7d8cc9a6358bfd44a00eb7368d8a1b /ports/vulkan | |
| parent | b0a2ff18c9f2c9131aed131f5bf0d97c0e23da8e (diff) | |
| parent | 8564602d06d7c4ce236f96a4f0f3ba7c2d769cb0 (diff) | |
| download | vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.tar.gz vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802
Diffstat (limited to 'ports/vulkan')
| -rw-r--r-- | ports/vulkan/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vulkan/portfile.cmake | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ports/vulkan/CONTROL b/ports/vulkan/CONTROL index 77f99641d..2d4947d31 100644 --- a/ports/vulkan/CONTROL +++ b/ports/vulkan/CONTROL @@ -1,3 +1,3 @@ Source: vulkan
-Version: 1.1.82.1
+Version: 1.1.82.1-1
Description: A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices.
\ No newline at end of file diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake index 31eb802b4..bf6c2d65e 100644 --- a/ports/vulkan/portfile.cmake +++ b/ports/vulkan/portfile.cmake @@ -33,5 +33,12 @@ if(VULKAN_DIR MATCHES "(([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+))") endif() endif() -configure_file(${VULKAN_DIR}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +if (EXISTS ${VULKAN_DIR}/../LICENSE.TXT) + configure_file(${VULKAN_DIR}/../LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +elseif(EXISTS ${VULKAN_DIR}/LICENSE.TXT) + configure_file(${VULKAN_DIR}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +else() + message(FATAL_ERROR "Could not find LICENSE.TXT") +endif() + SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file |