Cleanup: CMake: Modernize bf_rna dependencies
Pretty straightforward - Remove any bf_rna paths from INC - Add a dependency though LIB when missing context: https://devtalk.blender.org/t/cmake-cleanup/30260 Pull Request: https://projects.blender.org/blender/blender/pulls/132413
This commit is contained in:
committed by
Ray molenkamp
parent
455326fd67
commit
0dc484f9cc
@@ -4,7 +4,6 @@
|
||||
|
||||
set(INC
|
||||
.
|
||||
../../makesrna
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
@@ -45,6 +44,7 @@ set(LIB
|
||||
PRIVATE bf::gpu
|
||||
PRIVATE bf::intern::clog
|
||||
PRIVATE bf::intern::guardedalloc
|
||||
PRIVATE bf::rna
|
||||
)
|
||||
|
||||
# NOTE: use irrespective of `WITH_OPENGL_BACKEND` as the `bgl` module uses this for constants.
|
||||
|
||||
@@ -6,11 +6,8 @@ set(INC
|
||||
..
|
||||
../../editors/include
|
||||
../../imbuf/intern/oiio
|
||||
../../makesrna
|
||||
../../../../intern/mantaflow/extern
|
||||
../../../../intern/opencolorio
|
||||
# RNA_prototypes.hh
|
||||
${CMAKE_BINARY_DIR}/source/blender/makesrna
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
@@ -132,6 +129,7 @@ set(LIB
|
||||
|
||||
${PYTHON_LINKFLAGS}
|
||||
${PYTHON_LIBRARIES}
|
||||
PRIVATE bf::rna
|
||||
PRIVATE bf::windowmanager
|
||||
)
|
||||
|
||||
@@ -376,5 +374,3 @@ endif()
|
||||
|
||||
blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
||||
# RNA_prototypes.hh
|
||||
add_dependencies(bf_python bf_rna)
|
||||
|
||||
Reference in New Issue
Block a user