From cc516fb763b3a4b1faf37efbf0f6fc4c0ccfc60a Mon Sep 17 00:00:00 2001 From: Lassi Date: Fri, 8 Feb 2019 01:20:42 +0200 Subject: [vulkan] fix license copying on macOS (#5319) * Check if license exists in root of VULKAN_DIR, otherwise try one directory higher * [vulkan] Bump control version --- ports/vulkan/CONTROL | 2 +- 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 -- cgit v1.2.3