[Bf-blender-cvs] [02a76aa] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 02a76aa76513bd83667ed585d11bbbaba995e830
Author: Antony Riakiotakis
Date:   Thu Apr 30 15:18:02 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB02a76aa76513bd83667ed585d11bbbaba995e830

Merge branch 'master' into gooseberry

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



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

diff --cc CMakeLists.txt
index 4d65520,9c7308e..ff7c10f
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1137,22 -1127,9 +1137,22 @@@ if(UNIX AND NOT APPLE
  
  	if(WITH_LLVM OR WITH_SDL_DYNLOAD)
  		# Fix for conflict with Mesa llvmpipe
- 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/source/creator/blender.map")
+ 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'")
  	endif()
  
 +	if(WITH_ALEMBIC)
 +		find_package_wrapper(Alembic)
 +		set(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARIES} ${BOOST_LIBRARIES})
 +		if(NOT ALEMBIC_HDF5_FOUND AND WITH_HDF5)
 +			message(STATUS "Alembic is compiled without HDF5 support, disabling HDF5 options")
 +			set(WITH_HDF5 OFF)
 +		endif()
 +	endif()
 +
 +	if(WITH_HDF5)
 +		find_package_wrapper(HDF5)
 +	endif()
 +
  	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
  	list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm)