From f0ee4c3ffefbe93f0d1f6b711498ad9434276d0b Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Fri, 7 Jul 2023 15:37:02 +0200 Subject: [PATCH] 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 --- intern/atomic/CMakeLists.txt | 2 ++ intern/guardedalloc/CMakeLists.txt | 2 +- source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/blenlib/CMakeLists.txt | 2 +- source/blender/blenlib/tests/performance/CMakeLists.txt | 2 +- source/blender/bmesh/CMakeLists.txt | 2 +- source/blender/compositor/CMakeLists.txt | 2 +- source/blender/depsgraph/CMakeLists.txt | 2 +- source/blender/draw/CMakeLists.txt | 2 +- source/blender/editors/sculpt_paint/CMakeLists.txt | 2 +- source/blender/editors/space_file/CMakeLists.txt | 2 +- source/blender/editors/space_sequencer/CMakeLists.txt | 2 +- source/blender/gpu/CMakeLists.txt | 2 +- source/blender/makesdna/intern/CMakeLists.txt | 4 ++-- source/blender/makesrna/intern/CMakeLists.txt | 2 +- source/blender/render/CMakeLists.txt | 2 +- source/blender/sequencer/CMakeLists.txt | 2 +- 17 files changed, 19 insertions(+), 17 deletions(-) diff --git a/intern/atomic/CMakeLists.txt b/intern/atomic/CMakeLists.txt index 42ab86d1ca5..39f29be97ae 100644 --- a/intern/atomic/CMakeLists.txt +++ b/intern/atomic/CMakeLists.txt @@ -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 diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 7660af2bd5c..f96156e3171 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -35,7 +35,7 @@ set(SRC ) set(LIB - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ) if(WIN32 AND NOT UNIX) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index df30b946cd8..4629495d2e6 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -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} ) diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 7ed080d4905..1d6fef955fd 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -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} ) diff --git a/source/blender/blenlib/tests/performance/CMakeLists.txt b/source/blender/blenlib/tests/performance/CMakeLists.txt index e763f05086c..e3207de027e 100644 --- a/source/blender/blenlib/tests/performance/CMakeLists.txt +++ b/source/blender/blenlib/tests/performance/CMakeLists.txt @@ -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}") diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 4bcbfd974cf..c983443372f 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -172,7 +172,7 @@ set(LIB bf_blenkernel bf_blenlib extern_rangetree - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ) if(WITH_BULLET) diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 8976bd846b8..b3d0716e480 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -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 diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index c14dc661349..e04f235cee6 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -155,7 +155,7 @@ set(SRC set(LIB bf_blenkernel - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ) if(WITH_PYTHON) diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 38b783f21e9..5fb334aa7dd 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -361,7 +361,7 @@ set(LIB bf_blenlib bf_realtime_compositor bf_windowmanager - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ) set(GLSL_SRC diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 38949215682..1af93781129 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -97,7 +97,7 @@ set(SRC set(LIB bf_blenkernel bf_blenlib - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ) if(WITH_TBB) diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 76388b6597a..c09f2d698ff 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -51,7 +51,7 @@ set(SRC set(LIB bf_blenkernel extern_fmtlib - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ) if(WIN32) diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 3d1d4f98cac..efdec92d2df 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -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) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 14953eaa789..a82a1ef9dcf 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -326,7 +326,7 @@ set(METAL_SRC ) set(LIB - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ${Epoxy_LIBRARIES} ) diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 3a84bc3c336..c7a195a6704 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -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}") diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 2c7fd5590d6..d0b9be2dc01 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -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) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index e311581030f..4bb69d9df28 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -61,7 +61,7 @@ set(SRC set(LIB bf_realtime_compositor - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ) if(WITH_PYTHON) diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index ae22c484dca..89ad1054f9b 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -90,7 +90,7 @@ set(SRC set(LIB bf_blenkernel bf_blenlib - PRIVATE bf_intern_atomic + PRIVATE bf::intern::atomic ) if(WITH_AUDASPACE)