mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:57:55 +08:00
071f53715b
* [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>
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a4e779b..dc5f1a9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -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} ${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
|
|
diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
|
|
index acf6fb0..d0df7db 100644
|
|
--- a/glslc/CMakeLists.txt
|
|
+++ b/glslc/CMakeLists.txt
|
|
@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe)
|
|
target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
|
|
set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
|
|
target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
|
|
-add_dependencies(glslc_exe build-version)
|
|
|
|
shaderc_add_tests(
|
|
TEST_PREFIX glslc
|