Cleanup: Cmake: use alias target for bf_intern_atomic

This introduces an alias target `bf::intern::atomic` for
`bf_intern_atomic`. This has the following benefits:

- Any target name with `::` in it will be recognized as an actual
target by cmake, rather than a library name it may not know about.
and will be validated by cmake to exist. Which means if you make
a typo in the LIB section, CMake will error out telling you it
doesn't know about this specific target rather than passing it on
to the build system, where you'll either get build or linker errors
because of said typo.

- Given there is quite a cleanup still to do in the build system,
it won't always be obvious which targets have been updated to
modern targets and which still need to be done. Having a namespaced
target name is a good indicator there.

Pull Request: https://projects.blender.org/blender/blender/pulls/109784
This commit is contained in:
Ray Molenkamp 2023-07-07 15:37:02 +02:00 committed by Ray molenkamp
parent 79b2e8f211
commit f0ee4c3ffe
17 changed files with 19 additions and 17 deletions

@ -10,7 +10,9 @@ set(INC_SYS
)
add_library(bf_intern_atomic INTERFACE)
target_include_directories(bf_intern_atomic INTERFACE .)
add_library(bf::intern::atomic ALIAS bf_intern_atomic)
# CMake 3.19+ allows one to populate the interface library with
# source files to show in the IDE, for people on older CMake versions

@ -35,7 +35,7 @@ set(SRC
)
set(LIB
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
if(WIN32 AND NOT UNIX)

@ -557,7 +557,7 @@ set(LIB
bf_shader_fx
bf_simulation
extern_fmtlib
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
# For `vfontdata_freetype.c`.
${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
)

@ -393,7 +393,7 @@ set(LIB
bf_intern_eigen
bf_intern_guardedalloc
extern_wcwidth
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
${ZLIB_LIBRARIES}
${ZSTD_LIBRARIES}
)

@ -16,7 +16,7 @@ set(INC_SYS
set(LIB
PRIVATE bf_blenlib
PRIVATE bf_intern_guardedalloc
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
blender_add_performancetest_executable(BLI_ghash_performance "BLI_ghash_performance_test.cc" "${INC}" "${INC_SYS}" "${LIB}")

@ -172,7 +172,7 @@ set(LIB
bf_blenkernel
bf_blenlib
extern_rangetree
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
if(WITH_BULLET)

@ -602,7 +602,7 @@ if(WITH_COMPOSITOR_CPU)
bf_blenkernel
bf_blenlib
extern_clew
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
list(APPEND INC

@ -155,7 +155,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
if(WITH_PYTHON)

@ -361,7 +361,7 @@ set(LIB
bf_blenlib
bf_realtime_compositor
bf_windowmanager
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
set(GLSL_SRC

@ -97,7 +97,7 @@ set(SRC
set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
if(WITH_TBB)

@ -51,7 +51,7 @@ set(SRC
set(LIB
bf_blenkernel
extern_fmtlib
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
if(WIN32)

@ -55,7 +55,7 @@ set(SRC
set(LIB
bf_editor_interface
bf_editor_util
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
if(WITH_AUDASPACE)

@ -326,7 +326,7 @@ set(METAL_SRC
)
set(LIB
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
${Epoxy_LIBRARIES}
)

@ -93,7 +93,7 @@ setup_platform_linker_flags(makesdna)
setup_platform_linker_libs(makesdna)
blender_target_include_dirs(makesdna ${INC})
blender_target_include_dirs_sys(makesdna ${INC_SYS})
target_link_libraries(makesdna PRIVATE bf_intern_atomic)
target_link_libraries(makesdna PRIVATE bf::intern::atomic)
if(WIN32 AND NOT UNIX)
if(DEFINED PTHREADS_LIBRARIES)
@ -160,7 +160,7 @@ set(SRC
)
set(LIB
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
blender_add_lib(bf_dna_blenlib "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -433,7 +433,7 @@ blender_target_include_dirs(makesrna ${INC})
blender_target_include_dirs_sys(makesrna ${INC_SYS})
target_link_libraries(makesrna PRIVATE bf_dna)
target_link_libraries(makesrna PRIVATE bf_intern_atomic)
target_link_libraries(makesrna PRIVATE bf::intern::atomic)
target_link_libraries(makesrna PRIVATE bf_dna_blenlib)
if(WIN32 AND NOT UNIX)

@ -61,7 +61,7 @@ set(SRC
set(LIB
bf_realtime_compositor
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
if(WITH_PYTHON)

@ -90,7 +90,7 @@ set(SRC
set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf_intern_atomic
PRIVATE bf::intern::atomic
)
if(WITH_AUDASPACE)