Initial commit
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
diff --git a/utils/update_build_version.py b/utils/update_build_version.py
|
||||
--- a/utils/update_build_version.py
|
||||
+++ b/utils/update_build_version.py
|
||||
@@ -128,18 +128,18 @@
|
||||
|
||||
|
||||
def main():
|
||||
- if len(sys.argv) != 5:
|
||||
+ if len(sys.argv) < 5:
|
||||
print(('usage: {} <shaderc-dir> <spirv-tools-dir> <glslang-dir> <output-file>'.format(
|
||||
sys.argv[0])))
|
||||
sys.exit(1)
|
||||
|
||||
- projects = ['shaderc', 'spirv-tools', 'glslang']
|
||||
+ projects = ['shaderc']
|
||||
new_content = ''.join([
|
||||
'"{}\\n"\n'.format(get_version_string(p, d))
|
||||
for (p, d) in zip(projects, sys.argv[1:])
|
||||
])
|
||||
|
||||
- output_file = sys.argv[4]
|
||||
+ output_file = sys.argv[-1]
|
||||
mkdir_p(os.path.dirname(output_file))
|
||||
|
||||
if os.path.isfile(output_file):
|
||||
14
shaderc/all/patches/2021.1/install-shaderc_util.patch
Normal file
14
shaderc/all/patches/2021.1/install-shaderc_util.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
|
||||
--- a/libshaderc_util/CMakeLists.txt
|
||||
+++ b/libshaderc_util/CMakeLists.txt
|
||||
@@ -87,3 +87,10 @@
|
||||
add_dependencies(shaderc_util_file_finder_test testdata)
|
||||
add_dependencies(shaderc_util_io_shaderc_test testdata)
|
||||
endif()
|
||||
+
|
||||
+if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS)
|
||||
+ install(TARGETS shaderc_util
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+endif()
|
||||
17
shaderc/all/patches/2021.1/use-conan-dependencies.patch
Normal file
17
shaderc/all/patches/2021.1/use-conan-dependencies.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -112,7 +112,12 @@
|
||||
|
||||
# Configure subdirectories.
|
||||
# We depend on these for later projects, so they should come first.
|
||||
-add_subdirectory(third_party)
|
||||
+find_package(glslang REQUIRED CONFIG)
|
||||
+find_package(SPIRV-Headers REQUIRED CONFIG)
|
||||
+find_package(SPIRV-Tools REQUIRED CONFIG)
|
||||
+set(glslang_SOURCE_DIR ${glslang_INCLUDE_DIRS})
|
||||
+set(SPIRV-Headers_SOURCE_DIR ${SPIRV-Headers_INCLUDE_DIR}/..)
|
||||
+set(spirv-tools_SOURCE_DIR ${SPIRV-Tools_INCLUDE_DIR}/..)
|
||||
|
||||
add_subdirectory(libshaderc_util)
|
||||
add_subdirectory(libshaderc)
|
||||
Reference in New Issue
Block a user