mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 04:57:58 +08:00
66f1d9a747
* update shaderc * update shaderc * fix glslang cmake targets, re enable vcpkg_fixup_cmake_targets() * [spirv-tools] comment python distutils * remove comments, change path * glslang fix cmake targets * change version
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
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)
|
|
|
|
-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}
|
|
- 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
|
|
+++ 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
|
|
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)
|
|
|