aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Facioni <francisco@remyrobotics.com>2021-04-23 21:28:31 +0100
committerGitHub <noreply@github.com>2021-04-23 13:28:31 -0700
commit66b2cfb7e29a483fe95d1165be5b2c36c6273da2 (patch)
tree04db2dd243b1627b463b3553a4bb49850cd28437
parent03d35b030343934015900997cf452c8d71393246 (diff)
downloadvcpkg-66b2cfb7e29a483fe95d1165be5b2c36c6273da2.tar.gz
vcpkg-66b2cfb7e29a483fe95d1165be5b2c36c6273da2.zip
[spirv-cross] small cleanup (#17367)
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
-rw-r--r--ports/spirv-cross/portfile.cmake12
-rw-r--r--ports/spirv-cross/vcpkg.json1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/s-/spirv-cross.json5
4 files changed, 13 insertions, 7 deletions
diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake
index adb96cd40..951ba39cd 100644
--- a/ports/spirv-cross/portfile.cmake
+++ b/ports/spirv-cross/portfile.cmake
@@ -1,4 +1,3 @@
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@@ -33,11 +32,12 @@ foreach(COMPONENT core c cpp glsl hlsl msl reflect util)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/spirv_cross_${COMPONENT}/cmake TARGET_PATH share/spirv_cross_${COMPONENT})
endforeach()
-file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*")
-file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+vcpkg_copy_tools(
+ TOOL_NAMES spirv-cross
+ AUTO_CLEAN
+)
-# cleanup
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/spirv-cross/copyright COPYONLY)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/spirv-cross/vcpkg.json b/ports/spirv-cross/vcpkg.json
index 86c3ff3de..88b4a65f1 100644
--- a/ports/spirv-cross/vcpkg.json
+++ b/ports/spirv-cross/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "spirv-cross",
"version-date": "2021-01-15",
+ "port-version": 1,
"description": "SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.",
"homepage": "https://github.com/KhronosGroup/SPIRV-Cross",
"dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 04b75c148..53803c2d8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5746,7 +5746,7 @@
},
"spirv-cross": {
"baseline": "2021-01-15",
- "port-version": 0
+ "port-version": 1
},
"spirv-headers": {
"baseline": "2021-03-25",
diff --git a/versions/s-/spirv-cross.json b/versions/s-/spirv-cross.json
index c3a51b33d..0a114f604 100644
--- a/versions/s-/spirv-cross.json
+++ b/versions/s-/spirv-cross.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "ea4c1654c9909ec0b4cba6abdf37dbd1ac6bba53",
+ "version-date": "2021-01-15",
+ "port-version": 1
+ },
+ {
"git-tree": "c9d976a350220005632d3c23ff714e0cf267b836",
"version-date": "2021-01-15",
"port-version": 0