From d27ccf990c2b957a10f4676e3153f907829a4b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Barschkis?= Date: Mon, 16 Dec 2019 15:50:14 +0100 Subject: Mantaflow [Part 6]: Updates in /blender/source A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming. Reviewed By: sergey Maniphest Tasks: T59995 Differential Revision: https://developer.blender.org/D3855 --- extern/mantaflow/CMakeLists.txt | 203 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 extern/mantaflow/CMakeLists.txt (limited to 'extern/mantaflow') diff --git a/extern/mantaflow/CMakeLists.txt b/extern/mantaflow/CMakeLists.txt new file mode 100644 index 00000000000..72ce920c621 --- /dev/null +++ b/extern/mantaflow/CMakeLists.txt @@ -0,0 +1,203 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2016, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Sebastian Barschkis (sebbas) +# +# ***** END GPL LICENSE BLOCK ***** + +set(MANTAVERSION "0.12") + +add_definitions(-DWITH_FLUID=1) + +set(MANTA_DEP + dependencies +) +set(MANTA_HLP + helper +) +set(MANTA_PP + preprocessed +) + +if(WITH_TBB) + add_definitions(-DTBB=1) +endif() + +if(WITH_OPENVDB) + add_definitions(-DOPENVDB=1) +endif() + +set(INC + ${MANTA_PP} + ${MANTA_PP}/fileio + ${MANTA_PP}/python + ${MANTA_PP}/plugin + ${MANTA_HLP}/pwrapper + ${MANTA_HLP}/util + ${MANTA_DEP}/cnpy +) + +set(INC_SYS + ${PYTHON_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} +) + +if(WITH_TBB) + list(APPEND INC_SYS + ${TBB_INCLUDE_DIRS} + ) +endif() + +if(WITH_OPENVDB) + list(APPEND INC_SYS + ${BOOST_INCLUDE_DIR} + ${OPENEXR_INCLUDE_DIRS} + ${OPENVDB_INCLUDE_DIRS} + ) +endif() + +set(SRC + ${MANTA_DEP}/cnpy/cnpy.cpp + ${MANTA_DEP}/cnpy/cnpy.h + + ${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 + ${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 +# TODO (sebbas): add numpy to libraries +# ${MANTA_PP}/plugin/numpyconvert.cpp + ${MANTA_PP}/plugin/pressure.cpp + ${MANTA_PP}/plugin/ptsplugins.cpp + ${MANTA_PP}/plugin/secondaryparticles.cpp + ${MANTA_PP}/plugin/surfaceturbulence.cpp +# TODO (sebbas): add numpy to libraries +# ${MANTA_PP}/plugin/tfplugins.cpp + ${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 +# TODO (sebbas): add numpy to libraries +# ${MANTA_HLP}/pwrapper/numpyWrap.cpp +# ${MANTA_HLP}/pwrapper/numpyWrap.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 +) + +set(LIB +) + +blender_add_lib(extern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -- cgit v1.2.3