Skip to content

Commit 0004b56

Browse files
Updated Abseil
1 parent fa717b4 commit 0004b56

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

ThirdParty/abseil-cpp/CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ cmake_minimum_required (VERSION 3.11)
22

33
FetchContent_DeclareShallowGit(
44
abseil-cpp
5-
GIT_REPOSITORY https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp
6-
GIT_TAG f81f6c011baf9b0132a5594c034fe0060820711d
5+
GIT_REPOSITORY https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp
6+
GIT_TAG 72093794ac42be8105817ae0b0569fb411a6ca9b
77
)
88

99
set(CMAKE_CXX_STANDARD 17)
@@ -12,13 +12,5 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1212

1313
set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "" FORCE)
1414

15-
if (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang"))
16-
add_compile_options(
17-
-Wno-array-parameter
18-
-Wno-deprecated-builtins
19-
-Wno-unknown-warning-option
20-
)
21-
endif()
22-
2315
FetchContent_MakeAvailable(abseil-cpp)
2416
install(FILES "${abseil-cpp_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME abseil-cpp-License.txt)

ThirdParty/dawn/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ endif()
8787

8888
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
8989
target_compile_options(tint_api PRIVATE -Wno-switch-default)
90+
target_compile_options(tint_utils_strconv PRIVATE -Wno-nullability-extension)
9091
endif()
9192

9293
install(FILES "${Dawn_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME dawn-License.txt)

0 commit comments

Comments
 (0)