encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: Link diagnostic sources into tint_utils_io 

Splits these sources out into a separate library target to make sure
that it is only built once.

Many of these symbols are used by tint_utils_io, and building with
shared libraries enabled fails if they are not present.

Change-Id: I501d302b2502b22357f5691f012cd56ebcfde478
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/75600
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
James Price 2022-01-19 21:40:20 +00:00
parent b28c5ad3c6
commit 8f1d5224ee
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/CMakeLists.txt
View File

@ -36,6 +36,19 @@ function(tint_spvtools_compile_options TARGET)
endif() endif()
endfunction() endfunction()
## Tint diagnostic utilities. Used by libtint and tint_utils_io.
add_library(tint_diagnostic_utils
debug.cc
debug.h
diagnostic/diagnostic.cc
diagnostic/diagnostic.h
diagnostic/formatter.cc
diagnostic/formatter.h
diagnostic/printer.cc
diagnostic/printer.h
)
tint_default_compile_options(tint_diagnostic_utils)
set(TINT_LIB_SRCS set(TINT_LIB_SRCS
../include/tint/tint.h ../include/tint/tint.h
ast/access.cc ast/access.cc
@ -208,16 +221,8 @@ set(TINT_LIB_SRCS
castable.h castable.h
clone_context.cc clone_context.cc
clone_context.h clone_context.h
debug.cc
debug.h
demangler.cc demangler.cc
demangler.h demangler.h
diagnostic/diagnostic.cc
diagnostic/diagnostic.h
diagnostic/formatter.cc
diagnostic/formatter.h
diagnostic/printer.cc
diagnostic/printer.h
inspector/entry_point.cc inspector/entry_point.cc
inspector/entry_point.h inspector/entry_point.h
inspector/inspector.cc inspector/inspector.cc
@ -535,6 +540,7 @@ add_library(tint_utils_io
utils/io/tmpfile.h utils/io/tmpfile.h
) )
tint_default_compile_options(tint_utils_io) tint_default_compile_options(tint_utils_io)
target_link_libraries(tint_utils_io tint_diagnostic_utils)
## Tint validation utilities. Used by tests and the tint executable. ## Tint validation utilities. Used by tests and the tint executable.
add_library(tint_val add_library(tint_val
@ -562,6 +568,7 @@ target_link_libraries(tint_val tint_utils_io)
## Tint library ## Tint library
add_library(libtint ${TINT_LIB_SRCS}) add_library(libtint ${TINT_LIB_SRCS})
tint_default_compile_options(libtint) tint_default_compile_options(libtint)
target_link_libraries(libtint tint_diagnostic_utils)
if (${COMPILER_IS_LIKE_GNU}) if (${COMPILER_IS_LIKE_GNU})
target_compile_options(libtint PRIVATE -fvisibility=hidden) target_compile_options(libtint PRIVATE -fvisibility=hidden)
endif() endif()
@ -574,6 +581,7 @@ if (${TINT_BUILD_FUZZERS})
# Tint library with fuzzer instrumentation # Tint library with fuzzer instrumentation
add_library(libtint-fuzz ${TINT_LIB_SRCS}) add_library(libtint-fuzz ${TINT_LIB_SRCS})
tint_default_compile_options(libtint-fuzz) tint_default_compile_options(libtint-fuzz)
target_link_libraries(libtint-fuzz tint_diagnostic_utils)
if (${COMPILER_IS_LIKE_GNU}) if (${COMPILER_IS_LIKE_GNU})
target_compile_options(libtint-fuzz PRIVATE -fvisibility=hidden) target_compile_options(libtint-fuzz PRIVATE -fvisibility=hidden)
endif() endif()