diff options
| author | Connor Fitzgerald <connorwadefitzgerald@gmail.com> | 2019-03-07 00:17:52 -0500 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-06 21:17:52 -0800 |
| commit | 0ef0ddd739f5963ace1006158a5cb2e61def733b (patch) | |
| tree | 349ab76d7009989e1646d06bd55bfecb1745d06d /ports/spirv-tools | |
| parent | 59744f406ef9026b5ea53aa1b9b5f1a6fce696cd (diff) | |
| download | vcpkg-0ef0ddd739f5963ace1006158a5cb2e61def733b.tar.gz vcpkg-0ef0ddd739f5963ace1006158a5cb2e61def733b.zip | |
[spirv-headers] Add new port (#5576)
* [spirv-headers] Add new port
* [spirv-tools] depend on vcpkg spirv-headers
Diffstat (limited to 'ports/spirv-tools')
| -rw-r--r-- | ports/spirv-tools/CONTROL | 3 | ||||
| -rw-r--r-- | ports/spirv-tools/portfile.cmake | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/ports/spirv-tools/CONTROL b/ports/spirv-tools/CONTROL index fb75a1280..38995e356 100644 --- a/ports/spirv-tools/CONTROL +++ b/ports/spirv-tools/CONTROL @@ -1,3 +1,4 @@ Source: spirv-tools
-Version: 2018.1-1
+Version: 2018.1-2
Description: API and commands for processing SPIR-V modules
+Build-Depends: spirv-headers
diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index bbfdbf242..a554d2e57 100644 --- a/ports/spirv-tools/portfile.cmake +++ b/ports/spirv-tools/portfile.cmake @@ -10,14 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_from_github( - OUT_SOURCE_PATH SPIRV_HEADERS_PATH - REPO KhronosGroup/SPIRV-Headers - REF bd4c092be34081d88ec8342b1a4d9f77bcce4cac - SHA512 e0bc7b8ea73bef762eff60d83104ca93c70e06c7b6e66f73c931eb9ec51227e0b64c3169fcccbffa311acf714138300104dd5e51cdfc846ed7961debc1f9cceb - HEAD_REF master -) - vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") @@ -26,7 +18,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DSPIRV-Headers_SOURCE_DIR=${SPIRV_HEADERS_PATH} + -DSPIRV-Headers_SOURCE_DIR=${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET} -DSPIRV_WERROR=OFF ) |