[Bf-blender-cvs] [22e5ed20536] fluid-mantaflow: Merge branch 'master' into fluid-mantaflow

Sebastián Barschkis noreply at git.blender.org
Wed Nov 29 19:12:41 CET 2017


Commit: 22e5ed205360cf767f3b8ae39285056cc18c6cd8
Author: Sebastián Barschkis
Date:   Wed Nov 29 17:11:59 2017 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB22e5ed205360cf767f3b8ae39285056cc18c6cd8

Merge branch 'master' into fluid-mantaflow

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



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

diff --cc build_files/cmake/platform/platform_win32.cmake
index 2f5d41dac32,094ab94d881..066bea7d117
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@@ -31,6 -29,492 +29,497 @@@ if(NOT MSVC
  	message(FATAL_ERROR "Compiler is unsupported")
  endif()
  
+ # Libraries configuration for Windows when compiling with MSVC.
+ 
+ macro(warn_hardcoded_paths package_name
+ 	)
+ 	if(WITH_WINDOWS_FIND_MODULES)
+ 		message(WARNING "Using HARDCODED ${package_name} locations")
+ 	endif()
+ endmacro()
+ 
+ macro(windows_find_package package_name
+ 	)
+ 	if(WITH_WINDOWS_FIND_MODULES)
+ 		find_package(${package_name})
+ 	endif()
+ endmacro()
+ 
+ macro(find_package_wrapper)
+ 	if(WITH_WINDOWS_FIND_MODULES)
+ 		find_package(${ARGV})
+ 	endif()
+ endmacro()
+ 
+ add_definitions(-DWIN32)
+ # Minimum MSVC Version
+ if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+ 	if(MSVC_VERSION EQUAL 1800)
+ 		set(_min_ver "18.0.31101")
+ 		if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ 			message(FATAL_ERROR
+ 				"Visual Studio 2013 (Update 4, ${_min_ver}) required, "
+ 				"found (${CMAKE_CXX_COMPILER_VERSION})")
+ 		endif()
+ 	endif()
+ 	if(MSVC_VERSION EQUAL 1900)
+ 		set(_min_ver "19.0.24210")
+ 		if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ 			message(FATAL_ERROR
+ 				"Visual Studio 2015 (Update 3, ${_min_ver}) required, "
+ 				"found (${CMAKE_CXX_COMPILER_VERSION})")
+ 		endif()
+ 	endif()
+ endif()
+ unset(_min_ver)
+ 
+ # needed for some MSVC installations
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")
+ 
+ list(APPEND PLATFORM_LINKLIBS
+ 	ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32
+ 	advapi32 shfolder shell32 ole32 oleaut32 uuid psapi Dbghelp
+ )
+ 
+ if(WITH_INPUT_IME)
+ 	list(APPEND PLATFORM_LINKLIBS imm32)
+ endif()
+ 
+ add_definitions(
+ 	-D_CRT_NONSTDC_NO_DEPRECATE
+ 	-D_CRT_SECURE_NO_DEPRECATE
+ 	-D_SCL_SECURE_NO_DEPRECATE
+ 	-D_CONSOLE
+ 	-D_LIB
+ )
+ 
+ # MSVC11 needs _ALLOW_KEYWORD_MACROS to build
+ add_definitions(-D_ALLOW_KEYWORD_MACROS)
+ 
+ # We want to support Vista level ABI
+ add_definitions(-D_WIN32_WINNT=0x600)
+ 
+ # Make cmake find the msvc redistributables
+ set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+ include(InstallRequiredSystemLibraries)
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /nologo /J /Gd /MP /EHsc")
+ set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP")
+ 
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
+ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
+ 
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO ")
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib ")
+ 
+ # Ignore meaningless for us linker warnings.
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /ignore:4049 /ignore:4217 /ignore:4221")
+ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
+ 
+ if(CMAKE_CL_64)
+ 	set(PLATFORM_LINKFLAGS "/MACHINE:X64 ${PLATFORM_LINKFLAGS}")
+ else()
+ 	set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
+ endif()
+ 
+ set(PLATFORM_LINKFLAGS_DEBUG "/IGNORE:4099 /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
+ 
+ if(NOT DEFINED LIBDIR)
+ 
+ 	# Setup 64bit and 64bit windows systems
+ 	if(CMAKE_CL_64)
+ 		message(STATUS "64 bit compiler detected.")
+ 		set(LIBDIR_BASE "win64")
+ 	else()
+ 		message(STATUS "32 bit compiler detected.")
+ 		set(LIBDIR_BASE "windows")
+ 	endif()
+ 	if(MSVC_VERSION EQUAL 1911)
+ 		message(STATUS "Visual Studio 2017 detected.")
+ 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
+ 	elseif(MSVC_VERSION EQUAL 1910)
+ 		message(STATUS "Visual Studio 2017 detected.")
+ 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
+ 	elseif(MSVC_VERSION EQUAL 1900)
+ 		message(STATUS "Visual Studio 2015 detected.")
+ 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
+ 	else()
+ 		message(STATUS "Visual Studio 2013 detected.")
+ 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc12)
+ 	endif()
+ else()
+ 	message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
+ endif()
+ if(NOT EXISTS "${LIBDIR}/")
+ 	message(FATAL_ERROR "Windows requires pre-compiled libs at: '${LIBDIR}'")
+ endif()
+ 
+ # Add each of our libraries to our cmake_prefix_path so find_package() could work
+ file(GLOB children RELATIVE ${LIBDIR} ${LIBDIR}/*)
+ foreach(child ${children})
+ 	if(IS_DIRECTORY ${LIBDIR}/${child})
+ 		list(APPEND CMAKE_PREFIX_PATH  ${LIBDIR}/${child})
+ 	endif()
+ endforeach()
+ 
+ set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
+ set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib)
+ set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include)
+ set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib)
+ set(ZLIB_DIR ${LIBDIR}/zlib)
+ 
+ windows_find_package(zlib) # we want to find before finding things that depend on it like png
+ windows_find_package(png)
+ 
+ if(NOT PNG_FOUND)
+ 	warn_hardcoded_paths(libpng)
+ 	set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
+ 	set(PNG_LIBRARIES ${LIBDIR}/png/lib/libpng.lib)
+ 	set(PNG "${LIBDIR}/png")
+ 	set(PNG_INCLUDE_DIRS "${PNG}/include")
+ 	set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
+ endif()
+ 
+ set(JPEG_NAMES ${JPEG_NAMES} libjpeg)
+ windows_find_package(jpeg REQUIRED)
+ if(NOT JPEG_FOUND)
+ 	warn_hardcoded_paths(jpeg)
+ 	set(JPEG_INCLUDE_DIR ${LIBDIR}/jpeg/include)
+ 	set(JPEG_LIBRARIES ${LIBDIR}/jpeg/lib/libjpeg.lib)
+ endif()
+ 
+ set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
+ set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
+ 
+ set(FREETYPE ${LIBDIR}/freetype)
+ set(FREETYPE_INCLUDE_DIRS
+ 	${LIBDIR}/freetype/include
+ 	${LIBDIR}/freetype/include/freetype2
+ )
+ set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
+ windows_find_package(freetype REQUIRED)
+ 
+ if(WITH_FFTW3)
+ 	set(FFTW3 ${LIBDIR}/fftw3)
+ 	set(FFTW3_LIBRARIES ${FFTW3}/lib/libfftw.lib)
+ 	set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
+ 	set(FFTW3_LIBPATH ${FFTW3}/lib)
+ endif()
+ 
+ if(WITH_OPENCOLLADA)
+ 	set(OPENCOLLADA ${LIBDIR}/opencollada)
+ 
+ 	set(OPENCOLLADA_INCLUDE_DIRS
+ 		${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
+ 		${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
+ 		${OPENCOLLADA}/include/opencollada/COLLADAFramework
+ 		${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
+ 		${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
+ 	)
+ 
+ 	set(OPENCOLLADA_LIBRARIES
+ 		${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+ 		${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
+ 		${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
+ 		${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+ 		${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
+ 		${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
+ 		${OPENCOLLADA}/lib/opencollada/xml.lib
+ 		${OPENCOLLADA}/lib/opencollada/buffer.lib
+ 		${OPENCOLLADA}/lib/opencollada/ftoa.lib
+ 	)
+ 
+ 	if(NOT WITH_LLVM)
+ 		list(APPEND OPENCOLLADA_LIBRARIES ${OPENCOLLADA}/lib/opencollada/UTF.lib)
+ 	endif()
+ 
+ 	set(PCRE_LIBRARIES
+ 		${OPENCOLLADA}/lib/opencollada/pcre.lib
+ 	)
+ endif()
+ 
+ if(WITH_CODEC_FFMPEG)
+ 	set(FFMPEG_INCLUDE_DIRS
+ 		${LIBDIR}/ffmpeg/include
+ 		${LIBDIR}/ffmpeg/include/msvc
+ 	)
+ 	windows_find_package(FFMPEG)
+ 	if(NOT FFMPEG_FOUND)
+ 		warn_hardcoded_paths(ffmpeg)
+ 		set(FFMPEG_LIBRARY_VERSION 57)
+ 		set(FFMPEG_LIBRARY_VERSION_AVU 55)
+ 		set(FFMPEG_LIBRARIES
+ 			${LIBDIR}/ffmpeg/lib/avcodec.lib
+ 			${LIBDIR}/ffmpeg/lib/avformat.lib
+ 			${LIBDIR}/ffmpeg/lib/avdevice.lib
+ 			${LIBDIR}/ffmpeg/lib/avutil.lib
+ 			${LIBDIR}/ffmpeg/lib/swscale.lib
+ 			)
+ 	endif()
+ endif()
+ 
+ if(WITH_IMAGE_OPENEXR)
+ 	set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
+ 	set(OPENEXR_VERSION "2.1")
+ 	windows_find_package(OPENEXR REQUIRED)
+ 	if(NOT OPENEXR_FOUND)
+ 		warn_hardcoded_paths(OpenEXR)
+ 		set(OPENEXR ${LIBDIR}/openexr)
+ 		set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
+ 		set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
+ 		set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+ 		set(OPENEXR_LIBRARIES
+ 			optimized ${OPENEXR_LIBPATH}/Iex-2_2.lib
+ 			optimized ${OPENEXR_LIBPATH}/Half.lib
+ 			optimized ${OPENEXR_LIBPATH}/IlmImf-2_2.lib
+ 			optimized ${OPENEXR_LIBPATH}/Imath-2_2.lib
+ 			optimized ${OPENEXR_LIBPATH}/IlmThread-2_2.lib
+ 			debug ${OPENEXR_LIBPATH}/Iex-2_2_d.lib
+ 			debug ${OPENEXR_LIBPATH}/Half_d.lib
+ 			debug ${OPENEXR_LIBPATH}/IlmImf-2_2_d.lib
+ 			debug ${OPENEXR_LIBPATH}/Imath-2_2_d.lib
+ 			debug ${OPENEXR_LIBPATH}/IlmThread-2_2_d.lib
+ 		)
+ 	endif()
+ endif()
+ 
+ if(WITH_IMAGE_TIFF)
+ 	# Try to find tiff first then complain and set static and maybe wrong paths
+ 	windows_find_package(TIFF)
+ 	if(NOT TIFF_FOUND)
+ 		warn_hardcoded_paths(libtiff)
+ 		set(TIFF_LIBRARY ${LIBDIR}/tiff/lib/libtiff.lib)
+ 		set(TIFF_INCLUDE_DIR ${LIBDIR}/tiff/include)
+ 	endif()
+ endif()
+ 
+ if(WITH_JACK)
+ 	set(JACK_INCLUDE_DIRS
+ 		${LIBDIR}/jack/include/jack
+ 		${LIBDIR}/jack/include
+ 	)
+ 	set(JACK_LIBRARIES optimized ${LIBDIR}/jack/lib/libjack.lib debug ${LIBDIR}/jack/lib/libjack_d.lib)
+ endif()
+ 
+ if(WITH_PYTHON)
+ 	set(PYTHON_VERSION 3.6) # CACHE STRING)
+ 
+ 	string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+ 	# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
+ 	set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
+ 	unset(_PYTHON_VERSION_NO_DOTS)
+ 
+ 	# Shared includes for both vc2008 and vc2010
+ 	set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
+ 
+ 	# uncached vars
+ 	set(PYTHON_INCL

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list