diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-30 21:31:11 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-30 21:31:11 +0000 |
commit | a1cef16598d814178b0025fffa30f7a62020e3b5 (patch) | |
tree | 61fdc4d13d03b183d426e5f46d279833a51fec34 | |
parent | be0a849149e1d42e085d3a5804dea01c959d05ff (diff) | |
parent | 355eca4c47809879a76335f670f9e48e0849dc05 (diff) | |
download | shaderc-ndk-r24-release.tar.gz |
Snap for 7956253 from 355eca4c47809879a76335f670f9e48e0849dc05 to ndk-r24-releasendk-r24-rc1ndk-r24-beta2ndk-r24ndk-r24-release
Change-Id: I1de4d98bd54a12a15f5d5935c05b1f2ae28adb59
-rw-r--r-- | CHANGES | 7 | ||||
-rw-r--r-- | CMakeLists.txt | 22 | ||||
-rw-r--r-- | DEPS | 6 |
3 files changed, 27 insertions, 8 deletions
@@ -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 @@ else() 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 @@ endif() 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 @@ -5,11 +5,11 @@ vars = { '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 = { |