CMake/Cleanup: Use bf_intern_atomic target

Use the bf_intern_atomic target rather than adding a relative path to it in the INC section. Pull Request: https://projects.blender.org/blender/blender/pulls/109424
2023-06-28 19:12:55 +02:00
parent a60c1e5bb8
commit 2dac20e35f
16 changed files with 20 additions and 23 deletions
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -9,7 +9,6 @@ endif()
 set(INC
  .
  ..
-  ../atomic
 )

 set(INC_SYS
@@ -36,6 +35,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf_intern_atomic
 )

 if(WIN32 AND NOT UNIX)
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -29,7 +29,6 @@ set(INC
  ../../../intern/ghost
  ../../../intern/guardedalloc
  ../../../intern/iksolver/extern
-  ../../../intern/atomic
  ../../../intern/clog
  ../../../intern/libmv
  ../../../intern/mantaflow/extern
@@ -556,7 +555,7 @@ set(LIB
  bf_shader_fx
  bf_simulation
  extern_fmtlib
-
+  PRIVATE bf_intern_atomic
  # For `vfontdata_freetype.c`.
  ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
 )
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ..
  # ../blenkernel  # don't add this back!
  ../makesdna
-  ../../../intern/atomic
  ../../../intern/eigen
  ../../../intern/guardedalloc
 )
@@ -394,7 +393,7 @@ set(LIB
  bf_intern_eigen
  bf_intern_guardedalloc
  extern_wcwidth
-
+  PRIVATE bf_intern_atomic
  ${ZLIB_LIBRARIES}
  ${ZSTD_LIBRARIES}
 )
--- a/source/blender/blenlib/tests/performance/CMakeLists.txt
+++ b/source/blender/blenlib/tests/performance/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../..
  ../../../makesdna
-  ../../../../../intern/atomic
  ../../../../../intern/guardedalloc
 )

--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../blentranslation
  ../depsgraph
  ../makesdna
-  ../../../intern/atomic
  ../../../intern/clog
  ../../../intern/eigen
  ../../../intern/guardedalloc
@@ -173,6 +172,7 @@ set(LIB
  bf_blenkernel
  bf_blenlib
  extern_rangetree
+  PRIVATE bf_intern_atomic
 )

 if(WITH_BULLET)
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -24,7 +24,6 @@ if(WITH_COMPOSITOR_CPU)
    ../render
    ../render/intern
    ../../../extern/clew/include
-    ../../../intern/atomic
    ../../../intern/clog
    ../../../intern/guardedalloc

@@ -603,6 +602,7 @@ if(WITH_COMPOSITOR_CPU)
    bf_blenkernel
    bf_blenlib
    extern_clew
+    PRIVATE bf_intern_atomic
  )

  list(APPEND INC
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
  ../modifiers
  ../sequencer
  ../windowmanager
-  ../../../intern/atomic
  ../../../intern/guardedalloc
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -156,6 +155,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf_intern_atomic
 )

 if(WITH_PYTHON)
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -29,7 +29,6 @@ set(INC
  ../compositor/realtime_compositor/cached_resources
  ../windowmanager

-  ../../../intern/atomic
  ../../../intern/clog
  ../../../intern/guardedalloc
  ../../../intern/opensubdiv
@@ -355,6 +354,7 @@ set(LIB
  bf_blenlib
  bf_realtime_compositor
  bf_windowmanager
+  PRIVATE bf_intern_atomic
 )

 set(GLSL_SRC
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -20,7 +20,6 @@ set(INC
  ../../nodes
  ../../render
  ../../windowmanager
-  ../../../../intern/atomic
  ../../../../intern/clog
  ../../../../intern/eigen
  ../../../../intern/guardedalloc
@@ -98,6 +97,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf_intern_atomic
 )

 if(WITH_TBB)
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
  ../../makesrna
  ../../render
  ../../windowmanager
-  ../../../../intern/atomic
  ../../../../intern/guardedalloc
  ../../../../extern/fmtlib/include

@@ -52,6 +51,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  extern_fmtlib
+  PRIVATE bf_intern_atomic
 )

 if(WIN32)
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
  ../../makesrna
  ../../sequencer
  ../../windowmanager
-  ../../../../intern/atomic
  ../../../../intern/guardedalloc

  # dna_type_offsets.h
@@ -56,6 +55,7 @@ set(SRC
 set(LIB
  bf_editor_interface
  bf_editor_util
+  PRIVATE bf_intern_atomic
 )

 if(WITH_AUDASPACE)
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -38,7 +38,6 @@ set(INC
  # For node muting stuff.
  ../nodes

-  ../../../intern/atomic
  ../../../intern/clog
  ../../../intern/ghost
  ../../../intern/guardedalloc
@@ -327,6 +326,7 @@ set(METAL_SRC
 )

 set(LIB
+  PRIVATE bf_intern_atomic
  ${Epoxy_LIBRARIES}
 )

--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ..
  ../../blenlib
  ../../imbuf
-  ../../../../intern/atomic
  ../../../../intern/guardedalloc
  ${CMAKE_CURRENT_BINARY_DIR}
 )
@@ -80,10 +79,11 @@ add_executable(makesdna ${SRC} ${SRC_DNA_INC})
 setup_platform_linker_flags(makesdna)
 blender_target_include_dirs(makesdna ${INC})
 blender_target_include_dirs_sys(makesdna ${INC_SYS})
+target_link_libraries(makesdna PRIVATE bf_intern_atomic)

 if(WIN32 AND NOT UNIX)
  if(DEFINED PTHREADS_LIBRARIES)
-    target_link_libraries(makesdna ${PTHREADS_LIBRARIES})
+    target_link_libraries(makesdna PRIVATE ${PTHREADS_LIBRARIES})
  endif()
 endif()

@@ -133,7 +133,6 @@ blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 set(INC
  ..
  ../../blenlib
-  ../../../../intern/atomic
  ../../../../intern/guardedalloc
 )

@@ -156,6 +155,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf_intern_atomic
 )

 if(WITH_COMPILER_ASAN)
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -237,7 +237,6 @@ set(INC
  ../../render
  ../../../../intern/clog
  ../../../../intern/cycles/blender
-  ../../../../intern/atomic
  ../../../../intern/guardedalloc
  ../../../../intern/memutil
  ../../../../intern/mantaflow/extern
@@ -421,12 +420,13 @@ setup_platform_linker_flags(makesrna)
 blender_target_include_dirs(makesrna ${INC})
 blender_target_include_dirs_sys(makesrna ${INC_SYS})

-target_link_libraries(makesrna bf_dna)
-target_link_libraries(makesrna bf_dna_blenlib)
+target_link_libraries(makesrna PRIVATE bf_dna)
+target_link_libraries(makesrna PRIVATE bf_intern_atomic)
+target_link_libraries(makesrna PRIVATE bf_dna_blenlib)

 if(WIN32 AND NOT UNIX)
  if(DEFINED PTHREADS_LIBRARIES)
-    target_link_libraries(makesrna ${PTHREADS_LIBRARIES})
+    target_link_libraries(makesrna PRIVATE ${PTHREADS_LIBRARIES})
  endif()
 endif()

--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -22,7 +22,6 @@ set(INC
  ../sequencer
  ../simulation
  ../windowmanager
-  ../../../intern/atomic
  ../../../intern/guardedalloc
  ../../../intern/mikktspace
  ../../../intern/mantaflow/extern
@@ -62,6 +61,7 @@ set(SRC

 set(LIB
  bf_realtime_compositor
+  PRIVATE bf_intern_atomic
 )

 if(WITH_PYTHON)
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../makesrna
  ../render
  ../windowmanager
-  ../../../intern/atomic
  ../../../intern/clog
  ../../../intern/guardedalloc

@@ -91,6 +90,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf_intern_atomic
 )

 if(WITH_AUDASPACE)