diff options
| author | Jens Weggemann <jensweh@gmail.com> | 2018-10-12 06:27:22 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-11 21:27:22 -0700 |
| commit | 1ce7ee30b7b73c7f1bde423977499a8c23d2cf98 (patch) | |
| tree | 73deecafc6c8f360346bafb59ffb1d2d33c0af97 /ports/spirv-tools | |
| parent | adcf87465f11421a0dc4edad5ee6befbf28c2372 (diff) | |
| download | vcpkg-1ce7ee30b7b73c7f1bde423977499a8c23d2cf98.tar.gz vcpkg-1ce7ee30b7b73c7f1bde423977499a8c23d2cf98.zip | |
[shaderc] Fix for build (#4398)
* [shaderc] Fix for build
* [glslang] Use 'd' debug suffix on all platforms
* [shaderc][spirv-tools] Restore missing cmake options
Diffstat (limited to 'ports/spirv-tools')
| -rw-r--r-- | ports/spirv-tools/portfile.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 5120dc4f1..11d332a39 100644 --- a/ports/spirv-tools/portfile.cmake +++ b/ports/spirv-tools/portfile.cmake @@ -1,9 +1,6 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(WARNING "Dynamic not supported. Building static") - set(VCPKG_LIBRARY_LINKAGE "static") -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -23,12 +20,14 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}") +vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DSPIRV-Headers_SOURCE_DIR=${SPIRV_HEADERS_PATH} + OPTIONS + -DSPIRV-Headers_SOURCE_DIR=${SPIRV_HEADERS_PATH} + -DSPIRV_WERROR=OFF ) vcpkg_install_cmake() |