diff options
| author | Luke <Luke-Filewalker@users.noreply.github.com> | 2021-07-15 16:00:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 07:00:19 -0700 |
| commit | 071f53715b988b93a20da59c55fd85ee2aa6d65d (patch) | |
| tree | 7d0d977df5596667c4884b5ebc618b5f1f4f6665 /ports/shaderc/disable-update-version.patch | |
| parent | 6809996808414cf7b5ea631ca0660093c0c5b102 (diff) | |
| download | vcpkg-071f53715b988b93a20da59c55fd85ee2aa6d65d.tar.gz vcpkg-071f53715b988b93a20da59c55fd85ee2aa6d65d.zip | |
[glslang] Update to 11.1.0 (#15719)
* [shaderc] remove port since it does not build
* [glslang] updated to version 11.1.0
* [glslang] Add python path
* [glslang] baseline.json and glslang.json updated
* Update portfile.cmake
* Update CONTROL
* Update port_versions
* Update port_versions
* Update port_versions
* Update port_versions
* Update port_versions
* [glslang] port update to version 11.4.0
* [glslang] port version removed from json
* [glslang] remove shaderc
* [glslang] baseline update
* [glslang] versions hash update
* [glslang] portfile format fix + use of ${PORT}
* [glslang] new hash
* [glslang] revert portfile back
* [glslang] portfile apply changes
* [glslang] update hash for x86 windows
* [glslang] update to 1.5.0
* [glslang] git-tree hash update
* [glslang] remove old version 1.4.0
* [glslang] git-tree hash update
* [glslang][shaderc] Update and fix targets to match upstream
* Update versions
Co-authored-by: Lukas Lipp <llipp@cg.tuwien.ac.at>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <13720414433@163.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
Diffstat (limited to 'ports/shaderc/disable-update-version.patch')
| -rw-r--r-- | ports/shaderc/disable-update-version.patch | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/ports/shaderc/disable-update-version.patch b/ports/shaderc/disable-update-version.patch index 5ee016bcb..7bf47bd50 100644 --- a/ports/shaderc/disable-update-version.patch +++ b/ports/shaderc/disable-update-version.patch @@ -2,19 +2,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index a4e779b..dc5f1a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -81,12 +81,6 @@ add_subdirectory(libshaderc)
- add_subdirectory(glslc)
- add_subdirectory(examples)
+@@ -121,11 +121,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
+ add_subdirectory(examples)
+ endif()
-add_custom_target(build-version
- ${PYTHON_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
-- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR}
+- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
--
+
function(define_pkg_config_file NAME LIBS)
add_custom_target(${NAME}-pkg-config ALL
- COMMAND ${CMAKE_COMMAND}
diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
index acf6fb0..d0df7db 100644
--- a/glslc/CMakeLists.txt
@@ -27,15 +26,3 @@ index acf6fb0..d0df7db 100644 shaderc_add_tests(
TEST_PREFIX glslc
-diff --git a/spvc/CMakeLists.txt b/spvc/CMakeLists.txt
-index f465972..76f8c2e 100644
---- a/spvc/CMakeLists.txt
-+++ b/spvc/CMakeLists.txt
-@@ -3,7 +3,6 @@ shaderc_default_compile_options(spvc_exe)
- target_include_directories(spvc_exe PRIVATE ${shaderc_SOURCE_DIR}/libshaderc/include ${spirv-tools_SOURCE_DIR}/include)
- set_target_properties(spvc_exe PROPERTIES OUTPUT_NAME spvc)
- target_link_libraries(spvc_exe PRIVATE shaderc_spvc shaderc_util)
--add_dependencies(spvc_exe build-version)
-
- shaderc_add_asciidoc(spvc_doc_README README)
-
|