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/shaderc | |
| 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/shaderc')
| -rw-r--r-- | ports/shaderc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/shaderc/CMakeLists_spirv.txt | 12 | ||||
| -rw-r--r-- | ports/shaderc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/shaderc/portfile.cmake | 19 |
4 files changed, 10 insertions, 27 deletions
diff --git a/ports/shaderc/CMakeLists.txt b/ports/shaderc/CMakeLists.txt index 580ffa1d1..7ecdd03f9 100644 --- a/ports/shaderc/CMakeLists.txt +++ b/ports/shaderc/CMakeLists.txt @@ -15,8 +15,8 @@ ENDIF() add_library(glslang STATIC IMPORTED GLOBAL)
set_property(TARGET glslang PROPERTY IMPORTED_LOCATION "${GLSLANG}")
-set(glslang_SOURCE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" CACHE STRING "glslang source dir")
-set_property(TARGET glslang APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+find_path(glslang_SOURCE_DIR glslang/Include/Common)
+set_property(TARGET glslang APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${glslang_SOURCE_DIR}")
add_library(OSDependent STATIC IMPORTED GLOBAL)
set_property(TARGET OSDependent PROPERTY IMPORTED_LOCATION "${OSDEPENDENT}")
diff --git a/ports/shaderc/CMakeLists_spirv.txt b/ports/shaderc/CMakeLists_spirv.txt index 618177fa6..d9e013601 100644 --- a/ports/shaderc/CMakeLists_spirv.txt +++ b/ports/shaderc/CMakeLists_spirv.txt @@ -1,14 +1,8 @@ -option(SUFFIX_D "Add d Suffix to lib" ${SUFFIX_D}) -if(NOT SUFFIX_D) - find_library(SPIRVTOOLSOPT spirv-tools-opt) - find_library(SPIRVTOOLS spirv-tools) -ELSE() - find_library(SPIRVTOOLSOPT spirv-tools-opt) - find_library(SPIRVTOOLS spirv-tools) -ENDIF() +find_library(SPIRVTOOLSOPT SPIRV-Tools-opt) +find_library(SPIRVTOOLS SPIRV-Tools) add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL) set_property(TARGET SPIRV-Tools-opt PROPERTY IMPORTED_LOCATION "${SPIRVTOOLSOPT}") add_library(SPIRV-Tools STATIC IMPORTED GLOBAL) -set_property(TARGET SPIRV-Tools PROPERTY IMPORTED_LOCATION "${SPIRVTOOLS}")
\ No newline at end of file +set_property(TARGET SPIRV-Tools PROPERTY IMPORTED_LOCATION "${SPIRVTOOLS}") diff --git a/ports/shaderc/CONTROL b/ports/shaderc/CONTROL index 5a5c2c580..c428c0ea9 100644 --- a/ports/shaderc/CONTROL +++ b/ports/shaderc/CONTROL @@ -1,4 +1,4 @@ Source: shaderc -Version: 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-1 +Version: 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-2 Description: A collection of tools, libraries and tests for shader compilation. Build-Depends: glslang, spirv-tools diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index 2b925455b..d3ed5d023 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -1,11 +1,3 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - include(vcpkg_common_functions) vcpkg_from_github( @@ -14,11 +6,8 @@ vcpkg_from_github( REF 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da SHA512 6fb45a0b01e6709c44a11658648b9271fe06bd94023dcc5042c47b5f2a04889c2efb0ab4c166f18728594ac9b9aa9f8b354af46d88eb7f7c39c7246f52f5a933 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Do-not-generate-build-version.inc.patch + PATCHES + 0001-Do-not-generate-build-version.inc.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/third_party/glslang) @@ -36,11 +25,11 @@ endif() # shaderc uses python to manipulate copyright information vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) -set(ENV{PATH} "${PYTHON3_EXE_PATH};$ENV{PATH}") +vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DSHADERC_SKIP_TESTS=true ${OPTIONS} + OPTIONS -DSHADERC_SKIP_TESTS=true ${OPTIONS} -Dglslang_SOURCE_DIR=${CURRENT_INSTALLED_DIR}/include OPTIONS_DEBUG -DSUFFIX_D=true OPTIONS_RELEASE -DSUFFIX_D=false ) |