diff options
| author | Xin Li <delphij@google.com> | 2023-08-14 15:38:30 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-08-14 15:38:30 -0700 |
| commit | bddf63953e111d742b591c1c0c7c34bcda8a51c7 (patch) | |
| tree | 3a93128bff4b737b24b0c9581922c0b20410f0f4 /pw_multisink/CMakeLists.txt | |
| parent | ee890da55c82b95deca3518d5f3777e3d8ca9f0e (diff) | |
| parent | fbb9890f8922aa55fde183655a0017e69127ea4b (diff) | |
| download | pigweed-bddf63953e111d742b591c1c0c7c34bcda8a51c7.tar.gz | |
Merge Android U (ab/10368041)tmp_amf_298295554
Bug: 291102124
Merged-In: I10c41adb8fe3e126cfa4ff2f49b15863fff379de
Change-Id: I66f7a6cccaafc173d3924dae62a736c6c53520c7
Diffstat (limited to 'pw_multisink/CMakeLists.txt')
| -rw-r--r-- | pw_multisink/CMakeLists.txt | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/pw_multisink/CMakeLists.txt b/pw_multisink/CMakeLists.txt index 4d751805d..564e4b875 100644 --- a/pw_multisink/CMakeLists.txt +++ b/pw_multisink/CMakeLists.txt @@ -16,7 +16,7 @@ include($ENV{PW_ROOT}/pw_build/pigweed.cmake) pw_add_module_config(pw_multisink_CONFIG) -pw_add_module_library(pw_multisink.config +pw_add_library(pw_multisink.config INTERFACE HEADERS public/pw_multisink/config.h PUBLIC_INCLUDES @@ -25,7 +25,7 @@ pw_add_module_library(pw_multisink.config ${pw_multisink_CONFIG} ) -pw_add_module_library(pw_multisink +pw_add_library(pw_multisink STATIC HEADERS public/pw_multisink/multisink.h PUBLIC_INCLUDES @@ -49,7 +49,7 @@ pw_add_module_library(pw_multisink pw_varint ) -pw_add_module_library(pw_multisink.util +pw_add_library(pw_multisink.util STATIC HEADERS public/pw_multisink/util.h PUBLIC_INCLUDES @@ -65,7 +65,7 @@ pw_add_module_library(pw_multisink.util pw_function ) -pw_add_module_library(pw_multisink.test_thread +pw_add_library(pw_multisink.test_thread INTERFACE HEADERS public/pw_multisink/test_thread.h PUBLIC_INCLUDES @@ -79,12 +79,13 @@ pw_add_module_library(pw_multisink.test_thread # target that depends on this pw_add_module_library and a pw_add_module_library # that provides the implementaiton of pw_multisink.test_thread. See # pw_multisink.stl_multisink_test as an example. -pw_add_module_library(pw_multisink.multisink_threaded_test +pw_add_library(pw_multisink.multisink_threaded_test STATIC SOURCES multisink_threaded_test.cc PRIVATE_DEPS pw_multisink pw_multisink.test_thread + pw_string pw_thread.thread pw_thread.yield pw_unit_test @@ -93,18 +94,17 @@ pw_add_module_library(pw_multisink.multisink_threaded_test pw_add_test(pw_multisink.multisink_test SOURCES multisink_test.cc - DEPS + PRIVATE_DEPS pw_function pw_multisink - pw_polyfill.cstddef - pw_polyfill.span + pw_span pw_status GROUPS modules pw_multisink ) -pw_add_module_library(pw_multisink.stl_test_thread +pw_add_library(pw_multisink.stl_test_thread STATIC SOURCES stl_test_thread.cc PRIVATE_DEPS @@ -115,9 +115,8 @@ pw_add_module_library(pw_multisink.stl_test_thread if("${pw_thread.thread_BACKEND}" STREQUAL "pw_thread_stl.thread") pw_add_test(pw_multisink.stl_multisink_threaded_test - DEPS - pw_polyfill.cstddef - pw_polyfill.span + PRIVATE_DEPS + pw_span pw_multisink.multisink_threaded_test pw_multisink.stl_test_thread GROUPS |