diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
| commit | 2cc7fa27e57f1129d1f37ccb009563509ca25720 (patch) | |
| tree | 3c75e423b71e54f6f65ec085c5d3d190d9d0d1a9 /ports/vulkan | |
| parent | 3830517ec7519b823f5d8c404710889c6bd00278 (diff) | |
| parent | 2dfa568d186e4f0d199040929f9b3e44f27c8943 (diff) | |
| download | vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.tar.gz vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/5254
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 |