Consume absl libraries as namespace targets This allows cmake to correctly resolve the abseil dependencies of dawn targets. Change-Id: Iaaf87e2ea770f4664453cbcafbbcdc1a493aab30 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/192561 Auto-Submit: Jaswant Panchumarti <jaswant.panchumarti@kitware.com> Commit-Queue: dan sinclair <dsinclair@chromium.org> Reviewed-by: Jim Blackler <jimblackler@google.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/src/dawn/common/CMakeLists.txt b/src/dawn/common/CMakeLists.txt index 74b3399..615d3ec 100644 --- a/src/dawn/common/CMakeLists.txt +++ b/src/dawn/common/CMakeLists.txt
@@ -131,7 +131,7 @@ target_link_libraries(dawn_common PUBLIC dawncpp_headers PUBLIC partition_alloc - PRIVATE absl_inlined_vector + PRIVATE absl::inlined_vector PRIVATE dawn_internal_config )
diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt index 3178f05..44714f3 100644 --- a/src/dawn/native/CMakeLists.txt +++ b/src/dawn/native/CMakeLists.txt
@@ -257,11 +257,11 @@ dawn_internal_config libtint SPIRV-Tools-opt - absl_strings - absl_str_format_internal - absl_flat_hash_map - absl_flat_hash_set - absl_inlined_vector + absl::strings + absl::str_format_internal + absl::flat_hash_map + absl::flat_hash_set + absl::inlined_vector ) target_include_directories(dawn_native PRIVATE ${DAWN_ABSEIL_DIR})
diff --git a/src/dawn/wire/CMakeLists.txt b/src/dawn/wire/CMakeLists.txt index ba79b86..f61d68d 100644 --- a/src/dawn/wire/CMakeLists.txt +++ b/src/dawn/wire/CMakeLists.txt
@@ -111,8 +111,8 @@ PUBLIC dawn_headers PRIVATE - absl_flat_hash_map - absl_flat_hash_set + absl::flat_hash_map + absl::flat_hash_set dawn_common dawn_internal_config partition_alloc
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt index 9fd4316..d73a26c 100644 --- a/src/tint/CMakeLists.txt +++ b/src/tint/CMakeLists.txt
@@ -518,7 +518,7 @@ foreach(DEPENDENCY ${DEPENDENCIES}) # Each external dependency requires special handling... if(${DEPENDENCY} STREQUAL "abseil") target_link_libraries(${TARGET} PRIVATE - absl_strings + absl::strings ) elseif(${DEPENDENCY} STREQUAL "dl") target_link_libraries(${TARGET} PRIVATE ${CMAKE_DL_LIBS})
diff --git a/tools/android/webgpu/src/main/cpp/CMakeLists.txt b/tools/android/webgpu/src/main/cpp/CMakeLists.txt index bf346e1..0322ad6 100644 --- a/tools/android/webgpu/src/main/cpp/CMakeLists.txt +++ b/tools/android/webgpu/src/main/cpp/CMakeLists.txt
@@ -45,8 +45,7 @@ add_library(native_dawn methods.cpp structures.cpp Util.cpp ${CMAKE_SOURCE_DIR}/gen/include/dawn/webgpu.h) -# It is not clear why abs::raw_hash_set is not part of the bundled dependency tree naturally. -bundle_libraries(webgpu_c_bundled webgpu_dawn native_dawn absl::raw_hash_set) +bundle_libraries(webgpu_c_bundled webgpu_dawn native_dawn) find_library(log-lib log)