commit e2229c4262b3635752cb0ebfbfb2efbd70adb24a
author Jaswant Panchumarti <jaswant.panchumarti@kitware.com> Thu Jun 27 14:16:24 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 27 14:16:24 2024 +0000
tree 4b53001c6036dae79f275f0578b85fce26f14b92
parent a2e66bdb2f31a0a6361d169d401392346dcc2bd5

Use dawn_add_library function to create the dawn_utils library

Change-Id: I982bfa6e715281f569b872a9d9afa13a8d85f9c8
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/194922
Commit-Queue: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/dawn/utils/CMakeLists.txt

diff --git a/src/dawn/utils/CMakeLists.txt b/src/dawn/utils/CMakeLists.txt
index 0ae291e..ee782f3 100644
--- a/src/dawn/utils/CMakeLists.txt
+++ b/src/dawn/utils/CMakeLists.txt
@@ -25,63 +25,70 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-add_library(dawn_utils STATIC)
-common_compile_options(dawn_utils)
-target_sources(dawn_utils PRIVATE
-    "BinarySemaphore.cpp"
+set(private_headers
     "BinarySemaphore.h"
-    "ComboRenderBundleEncoderDescriptor.cpp"
     "ComboRenderBundleEncoderDescriptor.h"
-    "ComboRenderPipelineDescriptor.cpp"
     "ComboRenderPipelineDescriptor.h"
     "PlatformDebugLogger.h"
-    "SystemUtils.cpp"
     "SystemUtils.h"
-    "TerribleCommandBuffer.cpp"
     "TerribleCommandBuffer.h"
-    "TestUtils.cpp"
     "TestUtils.h"
-    "TextureUtils.cpp"
     "TextureUtils.h"
     "Timer.h"
-    "WGPUHelpers.cpp"
     "WGPUHelpers.h"
-    "WireHelper.cpp"
     "WireHelper.h"
 )
-target_link_libraries(dawn_utils
-    PUBLIC dawncpp_headers
-           partition_alloc
-    PRIVATE dawn_internal_config
-            dawn_common
-            dawn_native
-            dawn_proc
-            dawn_wire
+set(sources
+    "BinarySemaphore.cpp"
+    "ComboRenderBundleEncoderDescriptor.cpp"
+    "ComboRenderPipelineDescriptor.cpp"
+    "SystemUtils.cpp"
+    "TerribleCommandBuffer.cpp"
+    "TestUtils.cpp"
+    "TextureUtils.cpp"
+    "WGPUHelpers.cpp"
+    "WireHelper.cpp"
 )
-
-# Needed by WGPUHelpers
-target_compile_definitions(dawn_utils PUBLIC -DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>)
-if (TINT_BUILD_SPV_READER)
-    target_link_libraries(dawn_utils PRIVATE
-        SPIRV-Tools-opt
-    )
-endif ()
-
+set(conditional_private_depends)
 if(WIN32 AND NOT WINDOWS_STORE)
-    target_sources(dawn_utils PRIVATE "WindowsDebugLogger.cpp")
+  list(APPEND sources "WindowsDebugLogger.cpp")
 else()
-    target_sources(dawn_utils PRIVATE "EmptyDebugLogger.cpp")
+  list(APPEND sources "EmptyDebugLogger.cpp")
 endif()
 
 if(WIN32)
-    target_sources(dawn_utils PRIVATE "WindowsTimer.cpp")
+  list(APPEND sources "WindowsTimer.cpp")
 elseif(APPLE)
-    target_sources(dawn_utils PRIVATE
-        "OSXTimer.cpp"
+    list(APPEND private_headers
         "ObjCUtils.h"
-        "ObjCUtils.mm"
     )
-    target_link_libraries(dawn_utils PRIVATE "-framework QuartzCore")
+    list(APPEND sources
+        "ObjCUtils.mm"
+        "OSXTimer.cpp"
+    )
+    list(APPEND conditional_private_depends "-framework QuartzCore")
 elseif(UNIX)
-    target_sources(dawn_utils PRIVATE "PosixTimer.cpp")
+    list(APPEND sources "PosixTimer.cpp")
 endif()
+
+if (TINT_BUILD_SPV_READER)
+    list(APPEND conditional_private_depends SPIRV-Tools-opt)
+endif ()
+dawn_add_library(
+  dawn_utils
+  UTILITY_TARGET dawn_internal_config
+  PRIVATE_HEADERS
+    ${private_headers}
+  SOURCES
+    ${sources}
+  DEPENDS
+    dawn::dawn_wire
+    dawn::dawncpp_headers
+    dawn::partition_alloc
+  PRIVATE_DEPENDS
+    ${conditional_private_depends}
+)
+# Needed by WGPUHelpers
+target_compile_definitions(dawn_utils
+  PUBLIC
+    "-DTINT_BUILD_SPV_READER=$<BOOL:${TINT_BUILD_SPV_READER}>")