[Bf-blender-cvs] [2b23147] opensubdiv-modifier: Merge branch 'master' into opensubdiv-modifier

[Sergey Sharybin]

Commit: 2b23147a768a0bdd8d0b82ef55495a30d3e594a6
Author: Sergey Sharybin
Date:   Fri Jul 25 12:39:32 2014 +0600
Branches: opensubdiv-modifier
https://developer.blender.org/rB2b23147a768a0bdd8d0b82ef55495a30d3e594a6

Merge branch 'master' into opensubdiv-modifier

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



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

diff --cc CMakeLists.txt
index 1323375,b6fdccf..0dcf7be
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -886,20 -885,8 +886,20 @@@ if(UNIX AND NOT APPLE
  		endif()
  	endif()
  
 +	if(WITH_OPENSUBDIV)
 +		find_package_wrapper(OpenSubdiv)
 +
 +		set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBRARIES})
 +		set(OPENSUBDIV_LIBPATH)  # TODO, remove and reference the absolute path everywhere
 +
 +		if(NOT OPENSUBDIV_FOUND)
 +			set(WITH_OPENSUBDIV OFF)
 +			message(STATUS "OpenSundiv not found")
 +		endif()
 +	endif()
 +
  	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
- 	set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread")
+ 	list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm -lpthread)
  
  	if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
  		find_package(X11 REQUIRED)