Snap for 7956253 from 355eca4c47809879a76335f670f9e48e0849dc05 to ndk-r24-release
Change-Id: I1de4d98bd54a12a15f5d5935c05b1f2ae28adb59
diff --git a/CHANGES b/CHANGES
index fa738af..d68c626 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,12 @@
Revision history for Shaderc
+v2021.3 2021-11-11
+ - Add build switch to disable copyright check
+ - Update DEPS:
+ - SPIRV-Tools v2021.4
+ - SPIRV-Headers GitHub master 2021-11-11
+ - Glslang GitHub master 2021-11-11
+
v2021.2 2021-08-25
- README: Mention Common Lisp bindings (external)
- Update DEPS:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c8d1ae..b55e1f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,16 @@
message(STATUS "Configuring Shaderc to avoid building examples.")
endif()
+option(SHADERC_SKIP_COPYRIGHT_CHECK "Skip copyright check" ${SHADERC_SKIP_COPYRIGHT_CHECK})
+if(NOT ${SHADERC_SKIP_COPYRIGHT_CHECK})
+ set(SHADERC_ENABLE_COPYRIGHT_CHECK ON)
+endif()
+if(${SHADERC_ENABLE_COPYRIGHT_CHECK})
+ message(STATUS "Configuring Shaderc to check copyrights.")
+else()
+ message(STATUS "Configuring Shaderc to avoid checking copyrights.")
+endif()
+
option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON)
set (CMAKE_CXX_STANDARD 11)
@@ -82,11 +92,13 @@
find_host_package(PythonInterp 3 REQUIRED)
-add_custom_target(check-copyright ALL
- ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
- --check
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMENT "Check copyright")
+if (SHADERC_ENABLE_COPYRIGHT_CHECK)
+ add_custom_target(check-copyright ALL
+ ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
+ --check
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMENT "Check copyright")
+endif()
add_custom_target(add-copyright
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py
diff --git a/DEPS b/DEPS
index 76b95de..710a86e 100644
--- a/DEPS
+++ b/DEPS
@@ -5,11 +5,11 @@
'khronos_git': 'https://github.com/KhronosGroup',
'effcee_revision' : '2ec8f8738118cc483b67c04a759fee53496c5659',
- 'glslang_revision': 'a4599ef7561abed83d45bab4c7492daeceef92a5',
+ 'glslang_revision': '600c5037baac82a80851d1fb95f3f09d34bb43e8',
'googletest_revision': '389cb68b87193358358ae87cc56d257fd0d80189',
're2_revision': '7107ebc4fbf7205151d8d2a57b2fc6e7853125d4',
- 'spirv_headers_revision': '449bc986ba6f4c5e10e32828783f9daef2a77644',
- 'spirv_tools_revision': '1fbed83c8aab8517d821fcb4164c08567951938f',
+ 'spirv_headers_revision': '814e728b30ddd0f4509233099a3ad96fd4318c07',
+ 'spirv_tools_revision': 'ab8eb607750208066e2d57eff6a34dbaf05f5ada',
}
deps = {
