[Bf-blender-cvs] [04eaf6b] fluid-mantaflow: removed manta-full

Sebastián Barschkis noreply at git.blender.org
Thu Jan 28 12:36:51 CET 2016 

Commit: 04eaf6bd58f02c9893dc90ad7cf7df3780c0844f
Author: Sebastián Barschkis
Date:   Wed Sep 30 22:01:24 2015 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB04eaf6bd58f02c9893dc90ad7cf7df3780c0844f

removed manta-full

===================================================================

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
D	source/blender/python/manta_full/CMakeLists.txt
D	source/blender/python/manta_full/COPYING
D	source/blender/python/manta_full/Doxyfile.in
D	source/blender/python/manta_full/INSTALLING
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/adler32.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/compress.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/crc32.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/crc32.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/deflate.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/deflate.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzclose.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzguts.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzlib.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzread.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/gzwrite.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/infback.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/inffast.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/inffast.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/inffixed.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/inflate.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/inflate.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/inftrees.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/inftrees.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/trees.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/trees.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/uncompr.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/zconf.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/zlib.h
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/zutil.c
D	source/blender/python/manta_full/dependencies/zlib-1.2.8/zutil.h
D	source/blender/python/manta_full/resources/help.png
D	source/blender/python/manta_full/resources/keyboard.png
D	source/blender/python/manta_full/resources/pause.png
D	source/blender/python/manta_full/resources/play.png
D	source/blender/python/manta_full/resources/res.qrc
D	source/blender/python/manta_full/resources/stop.png
D	source/blender/python/manta_full/scenes/filaments.py
D	source/blender/python/manta_full/scenes/flip01_simple.py
D	source/blender/python/manta_full/scenes/flip02_surface.py
D	source/blender/python/manta_full/scenes/flip03_gen.py
D	source/blender/python/manta_full/scenes/flip04_adaptDt.py
D	source/blender/python/manta_full/scenes/flip05_narrow.py
D	source/blender/python/manta_full/scenes/flip06_secOrderBnd.py
D	source/blender/python/manta_full/scenes/freesurface.py
D	source/blender/python/manta_full/scenes/karman.py
D	source/blender/python/manta_full/scenes/plume_2d.py
D	source/blender/python/manta_full/scenes/plume_adaptDt.py
D	source/blender/python/manta_full/scenes/simplefire.py
D	source/blender/python/manta_full/scenes/simpleplume.py
D	source/blender/python/manta_full/scenes/turbulence.py
D	source/blender/python/manta_full/scenes/vortexsheets.py
D	source/blender/python/manta_full/scenes/waveEquation.py
D	source/blender/python/manta_full/scenes/waveletTurbulence.py
D	source/blender/python/manta_full/scenes/waveletTurbulenceObs.py
D	source/blender/python/manta_full/source/cmake/FindTBB.cmake
D	source/blender/python/manta_full/source/commonkernels.h
D	source/blender/python/manta_full/source/conjugategrad.cpp
D	source/blender/python/manta_full/source/conjugategrad.h
D	source/blender/python/manta_full/source/cuda/buoyancy.cu
D	source/blender/python/manta_full/source/cuda/cudatools.h
D	source/blender/python/manta_full/source/cuda/curlnoise.cu
D	source/blender/python/manta_full/source/cuda/curlnoise.h
D	source/blender/python/manta_full/source/cuda/meshtools.cu
D	source/blender/python/manta_full/source/cuda/particle.cu
D	source/blender/python/manta_full/source/cuda/turbulence.cu
D	source/blender/python/manta_full/source/edgecollapse.cpp
D	source/blender/python/manta_full/source/edgecollapse.h
D	source/blender/python/manta_full/source/fastmarch.cpp
D	source/blender/python/manta_full/source/fastmarch.h
D	source/blender/python/manta_full/source/fileio.cpp
D	source/blender/python/manta_full/source/fileio.h
D	source/blender/python/manta_full/source/fluidsolver.cpp
D	source/blender/python/manta_full/source/fluidsolver.h
D	source/blender/python/manta_full/source/general.cpp
D	source/blender/python/manta_full/source/general.h
D	source/blender/python/manta_full/source/grid.cpp
D	source/blender/python/manta_full/source/grid.h
D	source/blender/python/manta_full/source/gui/customctrl.cpp
D	source/blender/python/manta_full/source/gui/customctrl.h
D	source/blender/python/manta_full/source/gui/glwidget.cpp
D	source/blender/python/manta_full/source/gui/glwidget.h
D	source/blender/python/manta_full/source/gui/mainwindow.cpp
D	source/blender/python/manta_full/source/gui/mainwindow.h
D	source/blender/python/manta_full/source/gui/meshpainter.cpp
D	source/blender/python/manta_full/source/gui/meshpainter.h
D	source/blender/python/manta_full/source/gui/painter.cpp
D	source/blender/python/manta_full/source/gui/painter.h
D	source/blender/python/manta_full/source/gui/particlepainter.cpp
D	source/blender/python/manta_full/source/gui/particlepainter.h
D	source/blender/python/manta_full/source/gui/qtmain.cpp
D	source/blender/python/manta_full/source/gui/qtmain.h
D	source/blender/python/manta_full/source/kernel.cpp
D	source/blender/python/manta_full/source/kernel.h
D	source/blender/python/manta_full/source/levelset.cpp
D	source/blender/python/manta_full/source/levelset.h
D	source/blender/python/manta_full/source/mesh.cpp
D	source/blender/python/manta_full/source/mesh.h
D	source/blender/python/manta_full/source/movingobs.cpp
D	source/blender/python/manta_full/source/movingobs.h
D	source/blender/python/manta_full/source/noisefield.cpp
D	source/blender/python/manta_full/source/noisefield.h
D	source/blender/python/manta_full/source/particle.cpp
D	source/blender/python/manta_full/source/particle.h
D	source/blender/python/manta_full/source/plugin/advection.cpp
D	source/blender/python/manta_full/source/plugin/extforces.cpp
D	source/blender/python/manta_full/source/plugin/fire.cpp
D	source/blender/python/manta_full/source/plugin/flip.cpp
D	source/blender/python/manta_full/source/plugin/initplugins.cpp
D	source/blender/python/manta_full/source/plugin/kepsilon.cpp
D	source/blender/python/manta_full/source/plugin/meshplugins.cpp
D	source/blender/python/manta_full/source/plugin/pressure.cpp
D	source/blender/python/manta_full/source/plugin/vortexplugins.cpp
D	source/blender/python/manta_full/source/plugin/waveletturbulence.cpp
D	source/blender/python/manta_full/source/plugin/waves.cpp
D	source/blender/python/manta_full/source/preprocessor/code.cpp
D	source/blender/python/manta_full/source/preprocessor/code.h
D	source/blender/python/manta_full/source/preprocessor/codegen_kernel.cpp
D	source/blender/python/manta_full/source/preprocessor/codegen_python.cpp
D	source/blender/python/manta_full/source/preprocessor/main.cpp
D	source/blender/python/manta_full/source/preprocessor/merge.cpp
D	source/blender/python/manta_full/source/preprocessor/parse.cpp
D	source/blender/python/manta_full/source/preprocessor/prep.h
D	source/blender/python/manta_full/source/preprocessor/tokenize.cpp
D	source/blender/python/manta_full/source/preprocessor/tokenize.h
D	source/blender/python/manta_full/source/preprocessor/util.cpp
D	source/blender/python/manta_full/source/preprocessor/util.h
D	source/blender/python/manta_full/source/pwrapper/manta.h
D	source/blender/python/manta_full/source/pwrapper/pclass.cpp
D	source/blender/python/manta_full/source/pwrapper/pclass.h
D	source/blender/python/manta_full/source/pwrapper/pconvert.cpp
D	source/blender/python/manta_full/source/pwrapper/pconvert.h
D	source/blender/python/manta_full/source/pwrapper/pvec3.cpp
D	source/blender/python/manta_full/source/pwrapper/pymain.cpp
D	source/blender/python/manta_full/source/pwrapper/pythonInclude.h
D	source/blender/python/manta_full/source/pwrapper/registry.cpp
D	source/blender/python/manta_full/source/pwrapper/registry.h
D	source/blender/python/manta_full/source/python/defines.py
D	source/blender/python/manta_full/source/shapes.cpp
D	source/blender/python/manta_full/source/shapes.h
D	source/blender/python/manta_full/source/test.cpp
D	source/blender/python/manta_full/source/timing.cpp
D	source/blender/python/manta_full/source/timing.h
D	source/blender/python/manta_full/source/turbulencepart.cpp
D	source/blender/python/manta_full/source/turbulencepart.h
D	source/blender/python/manta_full/source/util/integrator.h
D	source/blender/python/manta_full/source/util/interpol.h
D	source/blender/python/manta_full/source/util/interpolHigh.h
D	source/blender/python/manta_full/source/util/mcubes.h
D	source/blender/python/manta_full/source/util/quaternion.h
D	source/blender/python/manta_full/source/util/randomstream.h
D	source/blender/python/manta_full/source/util/simpleimage.cpp
D	source/blender/python/manta_full/source/util/simpleimage.h
D	source/blender/python/manta_full/source/util/solvana.h
D	source/blender/python/manta_full/source/util/vectorbase.cpp
D	source/blender/python/manta_full/source/util/vectorbase.h
D	source/blender/python/manta_full/source/vortexfilament.cpp
D	source/blender/python/manta_full/source/vortexfilament.h
D	source/blender/python/manta_full/source/vortexpart.cpp
D	source/blender/python/manta_full/source/vortexpart.h
D	source/blender/python/manta_full/source/vortexsheet.cpp
D	source/blender/python/manta_full/source/vortexsheet.h
D	source/blender/python/manta_full/tools/makeHgVersion.py
D	source/blender/python/manta_full/tools/maya/AEbobjFluidObjectTemplate.mel
D	source/blender/python/manta_full/tools/maya/AEfluidGridObjectTemplate.mel
D	source/blender/python/manta_full/tools/maya/Makefile
D	source/blender/python/manta_full/tools/maya/README.txt
D	source/blender/python/manta_full/tools/maya/bobjFluidObject.cpp
D	source/blender/python/manta_full/tools/maya/bobjloader.mll
D	source/blender/python/manta_full/tools/maya/bobjloader.vcxproj
D	source/blender/python/manta_full/tools/maya/buildconfig.linux
D	source/blender/python/manta_full/tools/maya/buildconfig.osx
D	source/blender/python/manta_full/tools/maya/createBobjLoader.mel
D	source/blender/python/manta_full/tools/maya/createDensityLoader.mel
D	source/blender/python/manta_full/tools/maya/densityloader.cpp
D	source/blender/python/manta_full/tools/maya/densityloader.mll
D	source/blender/python/manta_full/tools/maya/densityloader.vcxproj
D	source/blender/python/manta_full/tools/maya/mayaplugins.sln
D	source/blender/python/manta_full/tools/testdata/readme.txt
D	source/blender/python/manta_full/tools/tests/helperGeneric.py
D	source/blender/python/manta_full/tools/tests/helperInclude.py
D	source/blender/python/manta_full/tools/tests/reader.py
D	source/blender/python/manta_full/tools/tests/runTests.py
D	source/blender/python/manta_full/tools/tests/test_0010_io.py
D	source/blender/python/manta_full/tools/tests/test_0011_inverted.py
D	source/blender/python/manta_full/tools/tests/test_0020_shapes.py
D	source/blender/python/manta_full/tools/tests/test_0030_gridop.py
D	source/blender/python/manta_full/tools/tests/test_0031_pdataop.py
D	source/blender/python/manta_full/tools/tests/test_0040_interpol2d.py
D	source/blender/python/manta_full/tools/tests/test_0041_interpol3d.py
D	source/blender/python/manta_full/tools/tests/test_0050_meshload.obj
D	source/blender/python/manta_full/tools/tests/test_0050_meshload.py
D	source/blender/python/manta_full/tools/tests/test_0100_psolve.py
D	source/blender/python/manta_full/tools/tests/test_1010_plume2d.py
D	source/blender/python/manta_full/tools/tests/test_1020_uvs.py
D	source/blender/python/manta_full/tools/tests/test_1030_waveeq.py
D	source/blender/python/manta_full/tools/tests/test_1040_secOrderBnd.py
D	source/blender/python/manta_full/tools/tests/test_1070_flip2d.py
D	source/blender/python/manta_full/tools/tests/test_1075_secorderBndFlip.py
D	source/blender/python/manta_full/tools/tests/test_2005_symmAdv.py
D	source/blender/python/manta_full/tools/tests/test_2010_plume3d.py
D	source/blender/python/manta_full/tools/tests/test_2011_plume3d_open.py
D	source/blender/python/manta_full/tools/tests/test_2020_obstacle.py
D	source/blender/python/manta_full/tools/tests/test_2025_turb.py
D	source/blender/python/manta_full/tools/tests/test_2045_fallingDrop.py
D	source/blender/python/manta_full/tools/tests/test_2050_freesurface.py
D	source/blender/python/manta_full/tools/tests/test_2065_partIo.py
D	source/blender/python/manta_full/tools/tests/test_2070_falldropFlip.py
D	source/blender/python/manta_full/tools/tests/test_2075_flipBrdam.py

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index de6c83e..4e14605 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit de6c83e12e75ffaac90eddbd3cb7451b57c2e0ce
+Subproject commit 4e1460519fb76d8fe4b838334d139a3e8d446827
diff --git a/release/scripts/addons b/release/scripts/addons
index 94c9c4e..cd26c93 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 94c9c4ee3370d1feb42fc978a1f0d2db07cb9431
+Subproject commit cd26c938e597d7493f3d88dfdf69346c0f8b50ee
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index e31cec5..34dc9b5 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit e31cec5bf243f00441c7dad7a775ec4722f829d3
+Subproject commit 34dc9b5a6a5917db65ac589c40fe1b5fed3605d1
diff --git a/source/blender/python/manta_full/CMakeLists.txt b/source/blender/python/manta_full/CMakeLists.txt
deleted file mode 100755
index f3ae446..0000000
--- a/source/blender/python/manta_full/CMakeLists.txt
+++ /dev/null
@@ -1,555 +0,0 @@
-#******************************************************************************
-#
-# MantaFlow fluid solver framework
-#
-# Copyright 2011-2015 Tobias Pfaff, Nils Thuerey
-#
-# This program is free software, distributed under the terms of the
-# GNU General Public License (GPL)
-# http://www.gnu.org/licenses
-#
-#******************************************************************************
-
-project (MantaFlow)
-cmake_minimum_required(VERSION 2.8) # 2.8 needed for CUDA
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/source/cmake/")
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-SET(VERBOSE 1)
-
-SET(MANTAVERSION "0.6")
-
-#******************************************************************************
-# Default paths
-# - CMake's path finder is completely useless for Qt5 + Python on Win64
-# - allow override from command line on OsX, eg use "cmake ..  -DCMAKE_PREFIX_PATH=/Users/someone/qt5.2.1/5.2.1/clang_64/
-
-IF(WIN32)
-	#set(WIN_QT_PATH "C:/Qt/5.3/msvc2013_64_opengl")
-	set(WIN_QT_PATH "C:/Qt/5.3/msvc2012_opengl") # qt5/win64
-	set(WIN_PYTHON_PATH "C:/Python34")
-	set(WIN_PYTHON_VERSION "34")
-	set(CMAKE_LIBRARY_PATH "C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64")
-	SET(CMAKE_PREFIX_PATH ${WIN_QT_PATH})
-ENDIF()
-
-IF(APPLE)
-	IF(NOT CMAKE_PREFIX_PATH)
-		SET(CMAKE_PREFIX_PATH "/usr/local/Cellar/qt5/5.4.2/") #  mac/homebrew
-		#SET(CMAKE_PREFIX_PATH "/home/myname/qt/5.5/clang_64") #  other...
-	ENDIF()
-ENDIF()
-
-#******************************************************************************
-# setup default params
-
-IF(NOT CMAKE_BUILD_TYPE)
-	SET(CMAKE_BUILD_TYPE "Release")
-ELSE()
-	MESSAGE("Build-type: '${CMAKE_BUILD_TYPE}'")
-ENDIF()
-
-# compilation versions
-OPTION(DEBUG "Enable debug compilation" OFF)
-OPTION(GUI "Compile with GUI (requires QT)" OFF)
-OPTION(TBB "Use multi-thread kernels using Intels TBB" OFF)
-OPTION(OPENMP "Use multi-thread kernels using OpenMP" OFF)
-OPTION(PREPDEBUG "Debug generated files" OFF) # This will beautify generated files, and link to them for compiler errors instead of the original sources
-OPTION(DOUBLEPRECISION "Compile with double floating point precision" OFF)
-# CUDA is deprecated, and not tested - enable at own risk...
-#OPTION(CUDA "Compile with CUDA plugins" OFF)
-
-#check consistency of MT options
-set(MT OFF)
-set(MT_TYPE "NONE")
-if (TBB)
-	set (MT_TYPE "TBB")
-	set (MT ON)
-endif()
-if (OPENMP)
-	set (MT_TYPE "OPENMP")
-	set (MT ON)
-endif()
-if (TBB AND OPENMP)
-	message(FATAL_ERROR "Cannot activate both OPENMP and TBB")
-endif()
-
-# make sure debug settings match...
-IF(NOT DEBUG)
-	IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-		SET(DEBUG 1)
-	ENDIF()
-ENDIF()
-IF(DEBUG)
-	SET(CMAKE_BUILD_TYPE "Debug")
-	add_definitions ( -DDEBUG )
-ENDIF()
-
-MESSAGE(STATUS "")
-MESSAGE(STATUS "Options - "
-	" -DDEBUG='${DEBUG}' "
-	" -DGUI='${GUI}' "
-	" -DTBB='${TBB}' "
-	" -DOPENMP='${OPENMP}' "
-	" -DPREPDEBUG='${PREPDEBUG}' "
-	" -DDOUBLEPRECISION='${DOUBLEPRECISION}' "
-	)
-# " -DCUDA='${CUDA}' "
-MESSAGE(STATUS "Multithreading type : ${MT_TYPE}")
-MESSAGE(STATUS "")
-
-#******************************************************************************
-# Pre-processor
-
-# compile prep
-SET(SOURCES
-	source/preprocessor/main.cpp
-	source/preprocessor/code.cpp
-	source/preprocessor/tokenize.cpp
-	source/preprocessor/parse.cpp
-	source/preprocessor/util.cpp
-	source/preprocessor/merge.cpp
-	source/preprocessor/codegen_python.cpp
-	source/preprocessor/codegen_kernel.cpp
-)
-add_executable(prep ${SOURCES})
-if (NOT WIN32)
-	set_target_properties(prep PROPERTIES COMPILE_FLAGS "-Wall -O2")
-endif()
-
-#******************************************************************************
-# Setup main project
-
-SET(F_LIBS "" )
-SET(F_LIB_PATHS)
-SET(F_LINKADD "") # additional linker flags, not a list
-set(PP_PATH "pp")
-SET(SILENT_SOURCES)
-
-# need pre-processing
-SET(PP_SOURCES
-	source/fluidsolver.cpp
-	source/conjugategrad.cpp
-	source/grid.cpp
-	source/levelset.cpp
-	source/fastmarch.cpp
-	source/shapes.cpp
-	source/mesh.cpp
-	source/general.cpp
-	source/particle.cpp
-	source/movingobs.cpp
-	source/fileio.cpp
-	source/noisefield.cpp
-	source/kernel.cpp
-	source/vortexsheet.cpp
-	source/vortexpart.cpp
-	source/turbulencepart.cpp
-	source/timing.cpp
-	source/edgecollapse.cpp
-	source/plugin/advection.cpp
-	source/plugin/extforces.cpp
-	source/plugin/fire.cpp
-	source/plugin/flip.cpp
-	source/plugin/kepsilon.cpp
-	source/plugin/initplugins.cpp
-	source/plugin/meshplugins.cpp
-	source/plugin/pressure.cpp
-	source/plugin/vortexplugins.cpp
-	source/plugin/waveletturbulence.cpp
-	source/plugin/waves.cpp
-	source/python/defines.py
-	source/test.cpp
-)
-
-SET(PP_HEADERS
-	source/commonkernels.h
-	source/conjugategrad.h
-	source/fastmarch.h
-	source/fluidsolver.h
-	source/grid.h
-	source/mesh.h
-	source/particle.h
-	source/levelset.h
-	source/shapes.h
-	source/noisefield.h
-	source/vortexsheet.h
-	source/general.h
-	source/kernel.h
-	source/timing.h
-	source/movingobs.h
-	source/fileio.h
-	source/edgecollapse.h
-	source/vortexpart.h
-	source/turbulencepart.h
-)
-
-# no pre-processing needed
-set(NOPP_SOURCES
-	source/pwrapper/pymain.cpp
-	source/pwrapper/pclass.cpp
-	source/pwrapper/pvec3.cpp
-	source/pwrapper/pconvert.cpp
-	source/pwrapper/registry.cpp
-	source/util/vectorbase.cpp
-	source/util/simpleimage.cpp
-)
-
-SET(NOPP_HEADERS
-	source/pwrapper/pythonInclude.h
-	source/pwrapper/pclass.h
-	source/pwrapper/registry.h
-	source/pwrapper/pconvert.h
-	source/util/integrator.h
-	source/util/vectorbase.h
-	source/util/quaternion.h
-	source/util/interpol.h
-	source/util/mcubes.h
-	source/util/randomstream.h
-	source/util/solvana.h
-)
-
-if (GUI)
-	# need QT preprocessor
-	set(QT_HEADERS
-		source/gui/mainwindow.h
-		source/gui/glwidget.h
-		source/gui/painter.h
-		source/gui/meshpainter.h
-		source/gui/qtmain.h
-		source/gui/customctrl.h
-		source/gui/particlepainter.h
-	)
-	set(QT_SOURCES
-		source/gui/customctrl.cpp
-		source/gui/mainwindow.cpp
-		source/gui/glwidget.cpp
-		source/gui/customctrl.cpp
-		source/gui/painter.cpp
-		source/gui/meshpainter.cpp
-		source/gui/particlepainter.cpp
-		source/gui/qtmain.cpp
-	)
-	list(APPEND PP_SOURCES ${QT_SOURCES})
-	list(APPEND PP_HEADERS ${QT_HEADERS})
-endif()
-
-# CUDA sources
-if (CUDA)
-	list(APPEND PP_SOURCES
-		source/cuda/meshtools.cu
-		source/cuda/buoyancy.cu
-		source/cuda/particle.cu
-	)
-endif()
-
-# include dirs
-SET(INCLUDE_PATHS
-	source/pwrapper
-	source/cuda
-	source/util
-	${CMAKE_CURRENT_BINARY_DIR}/${PP_PATH}/source
-)
-
-# Multithreading
-if(MT)
-	add_definitions( -DMT)
-	if(TBB)
-		# Intel TBB
-		add_definitions( -DTBB)
-
-		if (DEBUG)
-			add_definitions( -DTBB_USE_DEBUG=1 )
-			list(APPEND F_LIBS tbb)
-		else()
-			list(APPEND F_LIBS tbb)
-		endif()
-		if (WIN32)
-			find_package(TBB REQUIRED)
-			list(APPEND INCLUDE_PATHS ${TBB_INCLUDE_DIRS})
-			list(APPEND F_LIB_PATHS ${TBB_LIBRARY_DIRS})
-		elseif(APPLE)
-			find_package(TBB REQUIRED)
-			list(APPEND INCLUDE_PATHS ${TBB_INCLUDE_DIRS})
-			list(APPEND F_LIB_PATHS ${TBB_LIBRARY_DIRS})
-		endif()
-	else()
-		# OpenMP
-		add_definitions( -DOPENMP )
-
-		if (WIN32)
-			add_definitions( /openmp)
-		else()
-			add_definitions(-fopenmp)
-			SET(F_LINKADD "${F_LINKADD} -fopenmp ")
-		endif()
-	endif()
-endif()
-
-#******************************************************************************
-# add a target to generate API documentation with Doxygen
-
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-	set(DX_PATH "doxy")
-	foreach(it ${PP_SOURCES} ${PP_HEADERS} ${NOPP_SOURCES} ${NOPP_HEADERS})
-		get_filename_component(CURPATH ${it} PATH)
-		file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${DX_PATH}/${CURPATH}")
-		set(CURDX "${DX_PATH}/${it}")
-		string(REPLACE "/" "_" TGT ${CURDX})
-		string(REPLACE "source/" "" INFILE ${it})
-		add_custom_command(OUTPUT ${TGT}
-						COMMAND prep docgen "0" ${MT_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/source/" "${INFILE}" "${CURDX}"
-						DEPENDS prep
-						IMPLICIT_DEPENDS CXX ${it}
-						WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-		list(APPEND TGLIST ${TGT})
-	endforeach(it)
-
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-	add_custom_target(doc
-		${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-		DEPENDS ${TGLIST}
-		COMMENT "Generating API documentation with Doxygen" VERBATIM
-	)
-endif(DOXYGEN_FOUND)
-
-
-
-#******************************************************************************
-# Link libraries
-
-# Python
-set(Python_ADDITIONAL_VERSIONS 3.4)
-find_package(PythonLibs QUIET)
-if((NOT PYTHONLIBS_FOUND) AND WIN32)
-	set(PYTHON_INCLUDE_DIR "${WIN_PYTHON_PATH}/include")
-	set(PYTHON_LIBRARY "${WIN_PYTHON_PATH}/libs/python${WIN_PYTHON_VERSION}.lib")
-endif()
-find_package(PythonLibs REQUIRED)
-list(APPEND INCLUDE_PATHS ${PYTHON_INCLUDE_DIRS})
-list(APPEND F_LIBS ${PYTHON_LIBRARIES})
-
-# Z compression
-if (1)
-	# default: build from source
-	set(ZLIB_SRC adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzrea

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list