2022-02-10 22:07:11 +00:00
|
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
|
# Copyright 2016 Blender Foundation. All rights reserved.
|
2019-12-16 14:50:14 +00:00
|
|
|
# The Original Code is: all of this file.
|
2022-02-10 22:07:11 +00:00
|
|
|
# Contributor(s): Sebastian Barschkis (sebbas).
|
2019-12-16 14:50:14 +00:00
|
|
|
|
2019-12-20 17:50:40 +00:00
|
|
|
# Mantaflow triggers a clang-cl compiler error with versions before 9.0.1
|
|
|
|
|
# Since mantaflow does not appear to be using OpenMP at this point in time,
|
|
|
|
|
# disable the flag for now. See https://bugs.llvm.org/show_bug.cgi?id=43175 for details.
|
|
|
|
|
|
|
|
|
|
if(MSVC_CLANG AND WITH_OPENMP AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0.1")
|
|
|
|
|
remove_cc_flag("-fopenmp")
|
|
|
|
|
endif()
|
|
|
|
|
|
2020-09-25 08:17:10 +00:00
|
|
|
# Exporting functions from the blender binary gives linker warnings on Apple arm64 systems.
|
2021-03-11 15:09:30 +00:00
|
|
|
# Silence them here.
|
2020-09-25 08:17:10 +00:00
|
|
|
if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
|
|
|
|
|
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
2020-11-05 23:29:04 +00:00
|
|
|
string(APPEND CMAKE_C_FLAGS " -fvisibility=hidden")
|
|
|
|
|
string(APPEND CMAKE_CXX_FLAGS " -fvisibility=hidden")
|
2020-09-25 08:17:10 +00:00
|
|
|
endif()
|
|
|
|
|
endif()
|
|
|
|
|
|
2020-07-15 15:03:51 +00:00
|
|
|
set(MANTAVERSION "0.13")
|
2019-12-16 14:50:14 +00:00
|
|
|
|
|
|
|
|
add_definitions(-DWITH_FLUID=1)
|
|
|
|
|
|
2020-07-17 13:58:13 +00:00
|
|
|
# Compile Mantaflow dependencies too (e.g. cnpy for numpy file IO).
|
|
|
|
|
# Make sure that dependencies exist before enabling this option by updating the source files in extern/
|
|
|
|
|
set(WITH_MANTA_DEPENDENCIES 0)
|
|
|
|
|
|
2020-07-17 14:11:21 +00:00
|
|
|
# Enable Mantaflow numpy support
|
|
|
|
|
set(WITH_MANTA_NUMPY 0)
|
|
|
|
|
|
2020-07-17 13:58:13 +00:00
|
|
|
if(NOT WITH_MANTA_DEPENDENCIES)
|
|
|
|
|
add_definitions(-DNO_CNPY=1)
|
|
|
|
|
endif()
|
|
|
|
|
|
2019-12-16 14:50:14 +00:00
|
|
|
set(MANTA_HLP
|
|
|
|
|
helper
|
|
|
|
|
)
|
|
|
|
|
set(MANTA_PP
|
|
|
|
|
preprocessed
|
|
|
|
|
)
|
2020-07-17 13:58:13 +00:00
|
|
|
if(WITH_MANTA_DEPENDENCIES)
|
|
|
|
|
set(MANTA_DEP
|
|
|
|
|
dependencies
|
|
|
|
|
)
|
|
|
|
|
endif()
|
2019-12-16 14:50:14 +00:00
|
|
|
|
|
|
|
|
if(WITH_TBB)
|
|
|
|
|
add_definitions(-DTBB=1)
|
|
|
|
|
endif()
|
|
|
|
|
|
2020-02-26 18:10:07 +00:00
|
|
|
if(WITH_OPENVDB)
|
|
|
|
|
add_definitions(-DOPENVDB=1)
|
2021-02-10 17:17:23 +00:00
|
|
|
# OpenVDB headers use deprecated TBB headers, silence warning.
|
|
|
|
|
add_definitions(-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1)
|
2020-02-26 18:10:07 +00:00
|
|
|
endif()
|
|
|
|
|
|
2020-06-24 10:00:13 +00:00
|
|
|
if(WITH_OPENVDB_BLOSC)
|
|
|
|
|
add_definitions(-DOPENVDB_BLOSC=1)
|
|
|
|
|
endif()
|
|
|
|
|
|
2020-02-14 00:13:07 +00:00
|
|
|
if(WIN32)
|
|
|
|
|
add_definitions(-D_USE_MATH_DEFINES)
|
|
|
|
|
endif()
|
|
|
|
|
|
2020-12-14 15:40:00 +00:00
|
|
|
if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY)
|
2020-07-17 14:11:21 +00:00
|
|
|
add_definitions(-DNUMPY=1)
|
|
|
|
|
endif()
|
|
|
|
|
|
2019-12-16 14:50:14 +00:00
|
|
|
set(INC
|
|
|
|
|
${MANTA_PP}
|
|
|
|
|
${MANTA_PP}/fileio
|
|
|
|
|
${MANTA_PP}/python
|
|
|
|
|
${MANTA_PP}/plugin
|
|
|
|
|
${MANTA_HLP}/pwrapper
|
|
|
|
|
${MANTA_HLP}/util
|
|
|
|
|
)
|
|
|
|
|
|
2020-07-17 14:11:21 +00:00
|
|
|
if(WITH_MANTA_DEPENDENCIES)
|
|
|
|
|
list(APPEND INC
|
|
|
|
|
${MANTA_DEP}/cnpy
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
2019-12-16 14:50:14 +00:00
|
|
|
set(INC_SYS
|
|
|
|
|
${PYTHON_INCLUDE_DIRS}
|
|
|
|
|
${ZLIB_INCLUDE_DIRS}
|
|
|
|
|
)
|
|
|
|
|
|
2020-12-14 15:40:00 +00:00
|
|
|
if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY)
|
2020-07-17 14:11:21 +00:00
|
|
|
list(APPEND INC_SYS
|
|
|
|
|
${PYTHON_NUMPY_INCLUDE_DIRS}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
2019-12-16 14:50:14 +00:00
|
|
|
if(WITH_TBB)
|
|
|
|
|
list(APPEND INC_SYS
|
|
|
|
|
${TBB_INCLUDE_DIRS}
|
|
|
|
|
)
|
CMake: Refactor external dependencies handling
This is a more correct fix to the issue Brecht was fixing in D6600.
While the fix in that patch worked fine for linking it broke ASAN
runtime under some circumstances.
For example, `make full debug developer` would compile, but trying
to start blender will cause assert failure in ASAN (related on check
that ASAN is not running already).
Top-level idea: leave it to CMake to keep track of dependency graph.
The root of the issue comes to the fact that target like "blender" is
configured to use a lot of static libraries coming from Blender sources
and to use external static libraries. There is nothing which ensures
order between blender's and external libraries. Only order of blender
libraries is guaranteed.
It was possible that due to a cycle or other circumstances some of
blender libraries would have been passed to linker after libraries
it uses, causing linker errors.
For example, this order will likely fail:
libbf_blenfont.a libfreetype6.a libbf_blenfont.a
This change makes it so blender libraries are explicitly provided
their dependencies to an external libraries, which allows CMake to
ensure they are always linked against them.
General rule here: if bf_foo depends on an external library it is
to be provided to LIBS for bf_foo.
For example, if bf_blenkernel depends on opensubdiv then LIBS in
blenkernel's CMakeLists.txt is to include OPENSUBDIB_LIBRARIES.
The change is made based on searching for used include folders
such as OPENSUBDIV_INCLUDE_DIRS and adding corresponding libraries
to LIBS ion that CMakeLists.txt. Transitive dependencies are not
simplified by this approach, but I am not aware of any downside of
this: CMake should be smart enough to simplify them on its side.
And even if not, this shouldn't affect linking time.
Benefit of not relying on transitive dependencies is that build
system is more robust towards future changes. For example, if
bf_intern_opensubiv is no longer depends on OPENSUBDIV_LIBRARIES
and all such code is moved to bf_blenkernel this will not break
linking.
The not-so-trivial part is change to blender_add_lib (and its
version in Cycles). The complexity is caused by libraries being
provided as a single list argument which doesn't allow to use
different release and debug libraries on Windows. The idea is:
- Have every library prefixed as "optimized" or "debug" if
separation is needed (non-prefixed libraries will be considered
"generic").
- Loop through libraries passed to function and do simple parsing
which will look for "optimized" and "debug" words and specify
following library to corresponding category.
This isn't something particularly great. Alternative would be to
use target_link_libraries() directly, which sounds like more code
but which is more explicit and allows to have more flexibility
and control comparing to wrapper approach.
Tested the following configurations on Linux, macOS and Windows:
- make full debug developer
- make full release developer
- make lite debug developer
- make lite release developer
NOTE: Linux libraries needs to be compiled with D6641 applied,
otherwise, depending on configuration, it's possible to run into
duplicated zlib symbols error.
Differential Revision: https://developer.blender.org/D6642
2020-01-20 17:36:19 +00:00
|
|
|
list(APPEND LIB
|
|
|
|
|
${TBB_LIBRARIES}
|
|
|
|
|
)
|
2019-12-16 14:50:14 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
if(WITH_OPENVDB)
|
|
|
|
|
list(APPEND INC_SYS
|
|
|
|
|
${OPENVDB_INCLUDE_DIRS}
|
|
|
|
|
)
|
CMake: Refactor external dependencies handling
This is a more correct fix to the issue Brecht was fixing in D6600.
While the fix in that patch worked fine for linking it broke ASAN
runtime under some circumstances.
For example, `make full debug developer` would compile, but trying
to start blender will cause assert failure in ASAN (related on check
that ASAN is not running already).
Top-level idea: leave it to CMake to keep track of dependency graph.
The root of the issue comes to the fact that target like "blender" is
configured to use a lot of static libraries coming from Blender sources
and to use external static libraries. There is nothing which ensures
order between blender's and external libraries. Only order of blender
libraries is guaranteed.
It was possible that due to a cycle or other circumstances some of
blender libraries would have been passed to linker after libraries
it uses, causing linker errors.
For example, this order will likely fail:
libbf_blenfont.a libfreetype6.a libbf_blenfont.a
This change makes it so blender libraries are explicitly provided
their dependencies to an external libraries, which allows CMake to
ensure they are always linked against them.
General rule here: if bf_foo depends on an external library it is
to be provided to LIBS for bf_foo.
For example, if bf_blenkernel depends on opensubdiv then LIBS in
blenkernel's CMakeLists.txt is to include OPENSUBDIB_LIBRARIES.
The change is made based on searching for used include folders
such as OPENSUBDIV_INCLUDE_DIRS and adding corresponding libraries
to LIBS ion that CMakeLists.txt. Transitive dependencies are not
simplified by this approach, but I am not aware of any downside of
this: CMake should be smart enough to simplify them on its side.
And even if not, this shouldn't affect linking time.
Benefit of not relying on transitive dependencies is that build
system is more robust towards future changes. For example, if
bf_intern_opensubiv is no longer depends on OPENSUBDIV_LIBRARIES
and all such code is moved to bf_blenkernel this will not break
linking.
The not-so-trivial part is change to blender_add_lib (and its
version in Cycles). The complexity is caused by libraries being
provided as a single list argument which doesn't allow to use
different release and debug libraries on Windows. The idea is:
- Have every library prefixed as "optimized" or "debug" if
separation is needed (non-prefixed libraries will be considered
"generic").
- Loop through libraries passed to function and do simple parsing
which will look for "optimized" and "debug" words and specify
following library to corresponding category.
This isn't something particularly great. Alternative would be to
use target_link_libraries() directly, which sounds like more code
but which is more explicit and allows to have more flexibility
and control comparing to wrapper approach.
Tested the following configurations on Linux, macOS and Windows:
- make full debug developer
- make full release developer
- make lite debug developer
- make lite release developer
NOTE: Linux libraries needs to be compiled with D6641 applied,
otherwise, depending on configuration, it's possible to run into
duplicated zlib symbols error.
Differential Revision: https://developer.blender.org/D6642
2020-01-20 17:36:19 +00:00
|
|
|
list(APPEND LIB
|
|
|
|
|
${OPENVDB_LIBRARIES}
|
|
|
|
|
)
|
2021-02-17 19:23:01 +00:00
|
|
|
if(WIN32)
|
|
|
|
|
# OpenVDB emits lots of these, they should be suppressed through other
|
|
|
|
|
# means but MSVC 16.8/16.9 has broken this functionality, so C4251 is
|
|
|
|
|
# suppressed here explicitly. See
|
|
|
|
|
# https://developercommunity.visualstudio.com/content/problem/1167590/bug.html
|
|
|
|
|
# for details.
|
|
|
|
|
string(APPEND CMAKE_CXX_FLAGS " /wd4251")
|
|
|
|
|
endif()
|
2019-12-16 14:50:14 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
set(SRC
|
|
|
|
|
${MANTA_PP}/commonkernels.h
|
|
|
|
|
${MANTA_PP}/commonkernels.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/conjugategrad.cpp
|
|
|
|
|
${MANTA_PP}/conjugategrad.h
|
|
|
|
|
${MANTA_PP}/conjugategrad.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/edgecollapse.cpp
|
|
|
|
|
${MANTA_PP}/edgecollapse.h
|
|
|
|
|
${MANTA_PP}/edgecollapse.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/fastmarch.cpp
|
|
|
|
|
${MANTA_PP}/fastmarch.h
|
|
|
|
|
${MANTA_PP}/fastmarch.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/fileio/iogrids.cpp
|
|
|
|
|
${MANTA_PP}/fileio/iomeshes.cpp
|
|
|
|
|
${MANTA_PP}/fileio/ioparticles.cpp
|
2020-06-24 10:00:13 +00:00
|
|
|
${MANTA_PP}/fileio/ioutil.cpp
|
|
|
|
|
${MANTA_PP}/fileio/iovdb.cpp
|
|
|
|
|
${MANTA_PP}/fileio/mantaio.cpp
|
2019-12-16 14:50:14 +00:00
|
|
|
${MANTA_PP}/fileio/mantaio.h
|
|
|
|
|
${MANTA_PP}/fileio/mantaio.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/fluidsolver.cpp
|
|
|
|
|
${MANTA_PP}/fluidsolver.h
|
|
|
|
|
${MANTA_PP}/fluidsolver.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/general.cpp
|
|
|
|
|
${MANTA_PP}/general.h
|
|
|
|
|
${MANTA_PP}/general.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/gitinfo.h
|
|
|
|
|
${MANTA_PP}/grid.cpp
|
|
|
|
|
${MANTA_PP}/grid.h
|
|
|
|
|
${MANTA_PP}/grid.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/grid4d.cpp
|
|
|
|
|
${MANTA_PP}/grid4d.h
|
|
|
|
|
${MANTA_PP}/grid4d.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/kernel.cpp
|
|
|
|
|
${MANTA_PP}/kernel.h
|
|
|
|
|
${MANTA_PP}/kernel.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/levelset.cpp
|
|
|
|
|
${MANTA_PP}/levelset.h
|
|
|
|
|
${MANTA_PP}/levelset.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/mesh.cpp
|
|
|
|
|
${MANTA_PP}/mesh.h
|
|
|
|
|
${MANTA_PP}/mesh.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/movingobs.cpp
|
|
|
|
|
${MANTA_PP}/movingobs.h
|
|
|
|
|
${MANTA_PP}/movingobs.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/multigrid.cpp
|
|
|
|
|
${MANTA_PP}/multigrid.h
|
|
|
|
|
${MANTA_PP}/multigrid.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/noisefield.cpp
|
|
|
|
|
${MANTA_PP}/noisefield.h
|
|
|
|
|
${MANTA_PP}/noisefield.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/particle.cpp
|
|
|
|
|
${MANTA_PP}/particle.h
|
|
|
|
|
${MANTA_PP}/particle.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/plugin/advection.cpp
|
|
|
|
|
${MANTA_PP}/plugin/apic.cpp
|
|
|
|
|
${MANTA_PP}/plugin/extforces.cpp
|
|
|
|
|
${MANTA_PP}/plugin/fire.cpp
|
|
|
|
|
${MANTA_PP}/plugin/flip.cpp
|
|
|
|
|
${MANTA_PP}/plugin/fluidguiding.cpp
|
|
|
|
|
${MANTA_PP}/plugin/initplugins.cpp
|
|
|
|
|
${MANTA_PP}/plugin/kepsilon.cpp
|
|
|
|
|
${MANTA_PP}/plugin/meshplugins.cpp
|
|
|
|
|
${MANTA_PP}/plugin/pressure.cpp
|
|
|
|
|
${MANTA_PP}/plugin/ptsplugins.cpp
|
|
|
|
|
${MANTA_PP}/plugin/secondaryparticles.cpp
|
|
|
|
|
${MANTA_PP}/plugin/surfaceturbulence.cpp
|
2020-12-23 12:54:47 +00:00
|
|
|
${MANTA_PP}/plugin/viscosity.cpp
|
2019-12-16 14:50:14 +00:00
|
|
|
${MANTA_PP}/plugin/vortexplugins.cpp
|
|
|
|
|
${MANTA_PP}/plugin/waveletturbulence.cpp
|
|
|
|
|
${MANTA_PP}/plugin/waves.cpp
|
|
|
|
|
${MANTA_PP}/python/defines.py
|
|
|
|
|
${MANTA_PP}/python/defines.py.reg.cpp
|
|
|
|
|
${MANTA_PP}/registration.cpp
|
|
|
|
|
${MANTA_PP}/shapes.cpp
|
|
|
|
|
${MANTA_PP}/shapes.h
|
|
|
|
|
${MANTA_PP}/shapes.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/test.cpp
|
|
|
|
|
${MANTA_PP}/timing.cpp
|
|
|
|
|
${MANTA_PP}/timing.h
|
|
|
|
|
${MANTA_PP}/timing.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/turbulencepart.cpp
|
|
|
|
|
${MANTA_PP}/turbulencepart.h
|
|
|
|
|
${MANTA_PP}/turbulencepart.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/vortexpart.cpp
|
|
|
|
|
${MANTA_PP}/vortexpart.h
|
|
|
|
|
${MANTA_PP}/vortexpart.h.reg.cpp
|
|
|
|
|
${MANTA_PP}/vortexsheet.cpp
|
|
|
|
|
${MANTA_PP}/vortexsheet.h
|
|
|
|
|
${MANTA_PP}/vortexsheet.h.reg.cpp
|
|
|
|
|
|
|
|
|
|
${MANTA_HLP}/pwrapper/manta.h
|
|
|
|
|
${MANTA_HLP}/pwrapper/pclass.cpp
|
|
|
|
|
${MANTA_HLP}/pwrapper/pclass.h
|
|
|
|
|
${MANTA_HLP}/pwrapper/pconvert.cpp
|
|
|
|
|
${MANTA_HLP}/pwrapper/pconvert.h
|
|
|
|
|
${MANTA_HLP}/pwrapper/pvec3.cpp
|
|
|
|
|
${MANTA_HLP}/pwrapper/pythonInclude.h
|
|
|
|
|
${MANTA_HLP}/pwrapper/registry.cpp
|
|
|
|
|
${MANTA_HLP}/pwrapper/registry.h
|
|
|
|
|
${MANTA_HLP}/util/integrator.h
|
|
|
|
|
${MANTA_HLP}/util/interpol.h
|
|
|
|
|
${MANTA_HLP}/util/interpolHigh.h
|
|
|
|
|
${MANTA_HLP}/util/matrixbase.h
|
|
|
|
|
${MANTA_HLP}/util/mcubes.h
|
|
|
|
|
${MANTA_HLP}/util/quaternion.h
|
|
|
|
|
${MANTA_HLP}/util/randomstream.h
|
|
|
|
|
${MANTA_HLP}/util/rcmatrix.h
|
|
|
|
|
${MANTA_HLP}/util/simpleimage.cpp
|
|
|
|
|
${MANTA_HLP}/util/simpleimage.h
|
|
|
|
|
${MANTA_HLP}/util/solvana.h
|
|
|
|
|
${MANTA_HLP}/util/vector4d.cpp
|
|
|
|
|
${MANTA_HLP}/util/vector4d.h
|
|
|
|
|
${MANTA_HLP}/util/vectorbase.cpp
|
|
|
|
|
${MANTA_HLP}/util/vectorbase.h
|
|
|
|
|
)
|
|
|
|
|
|
2020-07-17 13:58:13 +00:00
|
|
|
if(WITH_MANTA_DEPENDENCIES)
|
|
|
|
|
list(APPEND SRC
|
|
|
|
|
${MANTA_DEP}/cnpy/cnpy.cpp
|
|
|
|
|
${MANTA_DEP}/cnpy/cnpy.h
|
|
|
|
|
)
|
|
|
|
|
endif()
|
2020-12-14 15:40:00 +00:00
|
|
|
if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY)
|
2020-07-17 14:11:21 +00:00
|
|
|
list(APPEND SRC
|
|
|
|
|
${MANTA_PP}/plugin/numpyconvert.cpp
|
|
|
|
|
${MANTA_PP}/plugin/tfplugins.cpp
|
|
|
|
|
${MANTA_HLP}/pwrapper/numpyWrap.cpp
|
|
|
|
|
${MANTA_HLP}/pwrapper/numpyWrap.h
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
2019-12-16 14:50:14 +00:00
|
|
|
set(LIB
|
CMake: Refactor external dependencies handling
This is a more correct fix to the issue Brecht was fixing in D6600.
While the fix in that patch worked fine for linking it broke ASAN
runtime under some circumstances.
For example, `make full debug developer` would compile, but trying
to start blender will cause assert failure in ASAN (related on check
that ASAN is not running already).
Top-level idea: leave it to CMake to keep track of dependency graph.
The root of the issue comes to the fact that target like "blender" is
configured to use a lot of static libraries coming from Blender sources
and to use external static libraries. There is nothing which ensures
order between blender's and external libraries. Only order of blender
libraries is guaranteed.
It was possible that due to a cycle or other circumstances some of
blender libraries would have been passed to linker after libraries
it uses, causing linker errors.
For example, this order will likely fail:
libbf_blenfont.a libfreetype6.a libbf_blenfont.a
This change makes it so blender libraries are explicitly provided
their dependencies to an external libraries, which allows CMake to
ensure they are always linked against them.
General rule here: if bf_foo depends on an external library it is
to be provided to LIBS for bf_foo.
For example, if bf_blenkernel depends on opensubdiv then LIBS in
blenkernel's CMakeLists.txt is to include OPENSUBDIB_LIBRARIES.
The change is made based on searching for used include folders
such as OPENSUBDIV_INCLUDE_DIRS and adding corresponding libraries
to LIBS ion that CMakeLists.txt. Transitive dependencies are not
simplified by this approach, but I am not aware of any downside of
this: CMake should be smart enough to simplify them on its side.
And even if not, this shouldn't affect linking time.
Benefit of not relying on transitive dependencies is that build
system is more robust towards future changes. For example, if
bf_intern_opensubiv is no longer depends on OPENSUBDIV_LIBRARIES
and all such code is moved to bf_blenkernel this will not break
linking.
The not-so-trivial part is change to blender_add_lib (and its
version in Cycles). The complexity is caused by libraries being
provided as a single list argument which doesn't allow to use
different release and debug libraries on Windows. The idea is:
- Have every library prefixed as "optimized" or "debug" if
separation is needed (non-prefixed libraries will be considered
"generic").
- Loop through libraries passed to function and do simple parsing
which will look for "optimized" and "debug" words and specify
following library to corresponding category.
This isn't something particularly great. Alternative would be to
use target_link_libraries() directly, which sounds like more code
but which is more explicit and allows to have more flexibility
and control comparing to wrapper approach.
Tested the following configurations on Linux, macOS and Windows:
- make full debug developer
- make full release developer
- make lite debug developer
- make lite release developer
NOTE: Linux libraries needs to be compiled with D6641 applied,
otherwise, depending on configuration, it's possible to run into
duplicated zlib symbols error.
Differential Revision: https://developer.blender.org/D6642
2020-01-20 17:36:19 +00:00
|
|
|
${PYTHON_LINKFLAGS}
|
|
|
|
|
${PYTHON_LIBRARIES}
|
2019-12-16 14:50:14 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
blender_add_lib(extern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
