2020-08-17 13:33:39 +02:00
|
|
|
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
--- a/CMakeLists.txt 2020-07-23 16:43:08.000000000 -0500
|
|
|
|
|
+++ b/CMakeLists.txt 2020-08-16 20:18:41.235394189 -0500
|
|
|
|
|
@@ -113,7 +113,6 @@
|
2018-12-15 00:22:44 +01:00
|
|
|
|
|
|
|
|
# Configure subdirectories.
|
|
|
|
|
# We depend on these for later projects, so they should come first.
|
|
|
|
|
-add_subdirectory(third_party)
|
2019-06-05 14:21:22 +02:00
|
|
|
|
|
|
|
|
if(SHADERC_ENABLE_SPVC)
|
|
|
|
|
add_subdirectory(libshaderc_spvc)
|
2020-08-17 13:33:39 +02:00
|
|
|
@@ -124,11 +123,6 @@
|
2018-12-15 00:22:44 +01:00
|
|
|
add_subdirectory(glslc)
|
|
|
|
|
add_subdirectory(examples)
|
2019-06-05 14:21:22 +02:00
|
|
|
|
2018-12-15 00:22:44 +01:00
|
|
|
-add_custom_target(build-version
|
2019-06-05 14:21:22 +02:00
|
|
|
- ${PYTHON_EXECUTABLE}
|
2018-12-15 00:22:44 +01:00
|
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
|
2020-02-17 13:59:38 +01:00
|
|
|
- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
|
2018-12-15 00:22:44 +01:00
|
|
|
- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
|
2020-08-17 13:33:39 +02:00
|
|
|
|
2019-06-05 14:21:22 +02:00
|
|
|
function(define_pkg_config_file NAME LIBS)
|
|
|
|
|
add_custom_target(${NAME}-pkg-config ALL
|
2020-08-17 13:33:39 +02:00
|
|
|
diff -Naur a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
|
|
|
|
|
--- a/libshaderc/CMakeLists.txt 2020-07-23 16:43:08.000000000 -0500
|
|
|
|
|
+++ b/libshaderc/CMakeLists.txt 2020-08-16 20:22:18.420735391 -0500
|
|
|
|
|
@@ -66,6 +66,8 @@
|
2018-12-15 00:22:44 +01:00
|
|
|
shaderc_util
|
|
|
|
|
SPIRV # from glslang
|
|
|
|
|
SPIRV-Tools
|
|
|
|
|
+ SPVRemapper
|
|
|
|
|
+ HLSL
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
|
