[Bf-blender-cvs] [1ed8eaa3488] fluid-mantaflow: Merge 'master' into 'fluid-mantaflow'
Bastien Montagne
noreply at git.blender.org
Sat May 4 15:56:25 CEST 2019
Commit: 1ed8eaa3488cc669b5991e11788bf3045f250ae7
Author: Bastien Montagne
Date: Sat May 4 12:35:55 2019 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB1ed8eaa3488cc669b5991e11788bf3045f250ae7
Merge 'master' into 'fluid-mantaflow'
===================================================================
===================================================================
diff --cc CMakeLists.txt
index 15fd1cf490e,7ab5655bff4..1dabdf0aabb
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1231,16 -1231,9 +1231,16 @@@ endif(
# Configure Python.
if(WITH_PYTHON_MODULE)
- add_definitions(-DPy_ENABLE_SHARED)
+ add_definitions(-DPy_ENABLE_SHARED)
endif()
+#-----------------------------------------------------------------------------
+# Configure mantaflow.
+
+if(WITH_MOD_MANTA)
- add_definitions(-DWITH_MANTA)
++ add_definitions(-DWITH_MANTA)
+endif()
+
#-----------------------------------------------------------------------------
# Configure GLog/GFlags
@@@ -1641,110 -1634,109 +1641,110 @@@ endif(
if(FIRST_RUN)
- set(_config_msg "\nBlender Configuration\n=====================")
-
- function(info_cfg_option
- _setting
- )
-
- set(_msg " - ${_setting}")
- string(LENGTH "${_msg}" _len)
- while("32" GREATER "${_len}")
- set(_msg "${_msg} ")
- math(EXPR _len "${_len} + 1")
- endwhile()
-
- set(_config_msg "${_config_msg}\n${_msg}${${_setting}}" PARENT_SCOPE)
- endfunction()
-
- function(info_cfg_text
- _text
- )
-
- set(_config_msg "${_config_msg}\n\n ${_text}" PARENT_SCOPE)
- endfunction()
-
- message(STATUS "C Compiler: \"${CMAKE_C_COMPILER_ID}\"")
- message(STATUS "C++ Compiler: \"${CMAKE_CXX_COMPILER_ID}\"")
-
- info_cfg_text("Build Options:")
- info_cfg_option(WITH_BULLET)
- info_cfg_option(WITH_IK_SOLVER)
- info_cfg_option(WITH_IK_ITASC)
- info_cfg_option(WITH_OPENCOLLADA)
- info_cfg_option(WITH_FFTW3)
- info_cfg_option(WITH_INTERNATIONAL)
- info_cfg_option(WITH_INPUT_NDOF)
- info_cfg_option(WITH_CYCLES)
- info_cfg_option(WITH_FREESTYLE)
- info_cfg_option(WITH_OPENCOLORIO)
- info_cfg_option(WITH_OPENVDB)
- info_cfg_option(WITH_ALEMBIC)
-
- info_cfg_text("Compiler Options:")
- info_cfg_option(WITH_BUILDINFO)
- info_cfg_option(WITH_OPENMP)
- info_cfg_option(WITH_RAYOPTIMIZATION)
-
- info_cfg_text("System Options:")
- info_cfg_option(WITH_INSTALL_PORTABLE)
- info_cfg_option(WITH_X11_ALPHA)
- info_cfg_option(WITH_X11_XF86VMODE)
- info_cfg_option(WITH_X11_XFIXES)
- info_cfg_option(WITH_X11_XINPUT)
- info_cfg_option(WITH_MEM_JEMALLOC)
- info_cfg_option(WITH_MEM_VALGRIND)
- info_cfg_option(WITH_SYSTEM_GLEW)
-
- info_cfg_text("Image Formats:")
- info_cfg_option(WITH_OPENIMAGEIO)
- info_cfg_option(WITH_IMAGE_CINEON)
- info_cfg_option(WITH_IMAGE_DDS)
- info_cfg_option(WITH_IMAGE_HDR)
- info_cfg_option(WITH_IMAGE_OPENEXR)
- info_cfg_option(WITH_IMAGE_OPENJPEG)
- info_cfg_option(WITH_IMAGE_TIFF)
-
- info_cfg_text("Audio:")
- info_cfg_option(WITH_OPENAL)
- info_cfg_option(WITH_SDL)
- info_cfg_option(WITH_SDL_DYNLOAD)
- info_cfg_option(WITH_JACK)
- info_cfg_option(WITH_JACK_DYNLOAD)
- info_cfg_option(WITH_CODEC_AVI)
- info_cfg_option(WITH_CODEC_FFMPEG)
- info_cfg_option(WITH_CODEC_SNDFILE)
-
- info_cfg_text("Compression:")
- info_cfg_option(WITH_LZMA)
- info_cfg_option(WITH_LZO)
-
- info_cfg_text("Python:")
- info_cfg_option(WITH_PYTHON_INSTALL)
- info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
- info_cfg_option(WITH_PYTHON_MODULE)
- info_cfg_option(WITH_PYTHON_SAFETY)
- if(APPLE)
- info_cfg_option(WITH_PYTHON_FRAMEWORK)
- endif()
-
- info_cfg_text("Modifiers:")
- info_cfg_option(WITH_MOD_REMESH)
- info_cfg_option(WITH_MOD_FLUID)
- info_cfg_option(WITH_MOD_MANTA)
- info_cfg_option(WITH_MOD_OCEANSIM)
-
- info_cfg_text("OpenGL:")
- info_cfg_option(WITH_GLEW_ES)
- info_cfg_option(WITH_GL_EGL)
- info_cfg_option(WITH_GL_PROFILE_ES20)
- if(WIN32)
- info_cfg_option(WITH_GL_ANGLE)
- endif()
-
- info_cfg_text("")
-
- message("${_config_msg}")
+ set(_config_msg "\nBlender Configuration\n=====================")
+
+ function(info_cfg_option
+ _setting
+ )
+
+ set(_msg " - ${_setting}")
+ string(LENGTH "${_msg}" _len)
+ while("32" GREATER "${_len}")
+ set(_msg "${_msg} ")
+ math(EXPR _len "${_len} + 1")
+ endwhile()
+
+ set(_config_msg "${_config_msg}\n${_msg}${${_setting}}" PARENT_SCOPE)
+ endfunction()
+
+ function(info_cfg_text
+ _text
+ )
+
+ set(_config_msg "${_config_msg}\n\n ${_text}" PARENT_SCOPE)
+ endfunction()
+
+ message(STATUS "C Compiler: \"${CMAKE_C_COMPILER_ID}\"")
+ message(STATUS "C++ Compiler: \"${CMAKE_CXX_COMPILER_ID}\"")
+
+ info_cfg_text("Build Options:")
+ info_cfg_option(WITH_BULLET)
+ info_cfg_option(WITH_IK_SOLVER)
+ info_cfg_option(WITH_IK_ITASC)
+ info_cfg_option(WITH_OPENCOLLADA)
+ info_cfg_option(WITH_FFTW3)
+ info_cfg_option(WITH_INTERNATIONAL)
+ info_cfg_option(WITH_INPUT_NDOF)
+ info_cfg_option(WITH_CYCLES)
+ info_cfg_option(WITH_FREESTYLE)
+ info_cfg_option(WITH_OPENCOLORIO)
+ info_cfg_option(WITH_OPENVDB)
+ info_cfg_option(WITH_ALEMBIC)
+
+ info_cfg_text("Compiler Options:")
+ info_cfg_option(WITH_BUILDINFO)
+ info_cfg_option(WITH_OPENMP)
+ info_cfg_option(WITH_RAYOPTIMIZATION)
+
+ info_cfg_text("System Options:")
+ info_cfg_option(WITH_INSTALL_PORTABLE)
+ info_cfg_option(WITH_X11_ALPHA)
+ info_cfg_option(WITH_X11_XF86VMODE)
+ info_cfg_option(WITH_X11_XFIXES)
+ info_cfg_option(WITH_X11_XINPUT)
+ info_cfg_option(WITH_MEM_JEMALLOC)
+ info_cfg_option(WITH_MEM_VALGRIND)
+ info_cfg_option(WITH_SYSTEM_GLEW)
+
+ info_cfg_text("Image Formats:")
+ info_cfg_option(WITH_OPENIMAGEIO)
+ info_cfg_option(WITH_IMAGE_CINEON)
+ info_cfg_option(WITH_IMAGE_DDS)
+ info_cfg_option(WITH_IMAGE_HDR)
+ info_cfg_option(WITH_IMAGE_OPENEXR)
+ info_cfg_option(WITH_IMAGE_OPENJPEG)
+ info_cfg_option(WITH_IMAGE_TIFF)
+
+ info_cfg_text("Audio:")
+ info_cfg_option(WITH_OPENAL)
+ info_cfg_option(WITH_SDL)
+ info_cfg_option(WITH_SDL_DYNLOAD)
+ info_cfg_option(WITH_JACK)
+ info_cfg_option(WITH_JACK_DYNLOAD)
+ info_cfg_option(WITH_CODEC_AVI)
+ info_cfg_option(WITH_CODEC_FFMPEG)
+ info_cfg_option(WITH_CODEC_SNDFILE)
+
+ info_cfg_text("Compression:")
+ info_cfg_option(WITH_LZMA)
+ info_cfg_option(WITH_LZO)
+
+ info_cfg_text("Python:")
+ info_cfg_option(WITH_PYTHON_INSTALL)
+ info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
+ info_cfg_option(WITH_PYTHON_MODULE)
+ info_cfg_option(WITH_PYTHON_SAFETY)
+ if(APPLE)
+ info_cfg_option(WITH_PYTHON_FRAMEWORK)
+ endif()
+
+ info_cfg_text("Modifiers:")
+ info_cfg_option(WITH_MOD_REMESH)
+ info_cfg_option(WITH_MOD_FLUID)
++ info_cfg_option(WITH_MOD_MANTA)
+ info_cfg_option(WITH_MOD_OCEANSIM)
+
+ info_cfg_text("OpenGL:")
+ info_cfg_option(WITH_GLEW_ES)
+ info_cfg_option(WITH_GL_EGL)
+ info_cfg_option(WITH_GL_PROFILE_ES20)
+ if(WIN32)
+ info_cfg_option(WITH_GL_ANGLE)
+ endif()
+
+ info_cfg_text("")
+
+ message("${_config_msg}")
endif()
if(0)
diff --cc build_files/cmake/macros.cmake
index 4cdd4478222,699f9cb1a99..0dee4800886
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -360,186 -360,183 +360,186 @@@ macro(setup_platform_linker_flags
endmacro()
function(setup_liblinks
- target
- )
-
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}" PARENT_SCOPE)
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}" PARENT_SCOPE)
-
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}" PARENT_SCOPE)
- set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}" PARENT_SCOPE)
-
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}" PARENT_SCOPE)
- set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}" PARENT_SCOPE)
-
- # jemalloc must be early in the list, to be before pthread (see T57998)
- if(WITH_MEM_JEMALLOC)
- target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
- endif()
-
- target_link_libraries(
- ${target}
- ${PNG_LIBRARIES}
- ${FREETYPE_LIBRARY}
- )
-
- # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
- if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
- target_link_libraries(${target} ${PYTHON_LINKFLAGS})
-
- if(WIN32 AND NOT UNIX)
- file_list_suffix(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
- target_link_libraries_debug(${target} "${PYTHON_LIBRARIES_DEBUG}")
- target_link_libraries_optimized(${target} "${PYTHON_LIBRARIES}")
- unset(PYTHON_LIBRARIES_DEBUG)
- else()
- target_link_libraries(${target} ${PYTHON_LIBRARIES})
- endif()
- endif()
-
- if(WITH_LZO AND WITH_SYSTEM_LZO)
- target_link_libraries(${target} ${LZO_LIBRARIES})
- endif()
- if(WITH_SYSTEM_GLEW)
- target_link_libraries(${target} ${BLENDER_GLEW_LIBRARIES})
- endif()
- if(WITH_BULLET AND WITH_SYSTEM_BULLET)
- target_link_libraries(${target} ${BULLET_LIBRARIES})
- endif()
- if(WITH_AUDASPACE AND WITH_SYSTEM_AUDASPACE)
- target_link_libraries(${target} ${AUDASPACE_C_LIBRARIES} ${AUDASPACE_PY_LIBRARIES})
- endif()
- if(WITH_OPENAL)
- target_link_libraries(${target} ${OPENAL_LIBRARY})
- endif()
- if(WITH_FFTW3)
- target_link_libraries(${target} ${FFTW3_LIBRARIES})
- endif()
- if(WITH_JACK AND NOT WITH_JACK_DYNLOAD)
- target_link_libraries(${target} ${JACK_LIBRARIES})
- endif()
- if(WITH_CODEC_SNDFILE)
- target_link_libraries(${target} ${LIBSNDFILE_LIBRARIES})
- endif()
- if(WITH_SDL AND NOT WITH_SDL_DYNLOAD)
- target_link_libraries(${target} ${SDL_LIBRARY})
- endif()
- if(WITH_CYCLES_OSL)
- target_link_libraries(${target} ${OSL_LIBRARIES})
- endif()
- if(WITH_OPENVDB)
- target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
- endif()
- if(WITH_OPENIMAGEIO)
- target_link_libraries(${target} ${OPENIMAGEIO_LIBRARIES})
- endif()
- if(WITH_OPENCOLORIO)
- target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
- endif()
- if(WITH_OPENSUBDIV)
- target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
- endif()
- if(WITH_CYCLES_EMBREE)
- target_link_libraries(${target} ${EMBREE_LIBRARIES})
- endif()
- if(WITH_BOOST)
- target_link_libraries(${target} ${BOOST_LIBRARIES})
- if(Boost_USE_STATIC_LIBS A
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list