| commit | d73ee7390c52dec42b6a11b4495c4cb7b8bc1aeb | [log] [tgz] |
|---|---|---|
| author | Jaswant Panchumarti <jaswant.panchumarti@kitware.com> | Fri Jun 21 13:21:57 2024 +0000 |
| committer | Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> | Fri Jun 21 13:21:57 2024 +0000 |
| tree | 490f0f474c5debaa0f5b2e4b4d1d863a294b5189 | |
| parent | 72b712f246b63918d30c6a72d70ef8c144aff2e5 [diff] |
Move BundleLibraries cmake module inside src/cmake Change-Id: Ic421eff187c1fb44eac51a14f4b372040d255424 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/194901 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jim Blackler <jimblackler@google.com> Reviewed-by: dan sinclair <dsinclair@chromium.org> Auto-Submit: Jaswant Panchumarti <jaswant.panchumarti@kitware.com> Commit-Queue: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
diff --git a/tools/android/webgpu/src/main/cpp/BundleLibraries.cmake b/src/cmake/BundleLibraries.cmake similarity index 100% rename from tools/android/webgpu/src/main/cpp/BundleLibraries.cmake rename to src/cmake/BundleLibraries.cmake
diff --git a/tools/android/webgpu/src/main/cpp/CMakeLists.txt b/tools/android/webgpu/src/main/cpp/CMakeLists.txt index dab54a8..a213fcf 100644 --- a/tools/android/webgpu/src/main/cpp/CMakeLists.txt +++ b/tools/android/webgpu/src/main/cpp/CMakeLists.txt
@@ -30,8 +30,6 @@ cmake_minimum_required(VERSION 3.22.1) -include(${CMAKE_CURRENT_LIST_DIR}/BundleLibraries.cmake) - set(DAWN_BUILD_ANDROID_SAMPLES OFF) set(DAWN_BUILD_SAMPLES OFF) set(TINT_BUILD_TESTS OFF) @@ -47,6 +45,8 @@ target_link_libraries(native_dawn webgpu_dawn) +list(INSERT CMAKE_MODULE_PATH 0 ../../../../../../src/cmake) +include(BundleLibraries) bundle_libraries(webgpu_c_bundled native_dawn) find_library(log-lib log)