[Bf-blender-cvs] [771bad9] soc-2014-viewport_context: Merge branch 'master' into soc-2014-viewport_context

[Campbell Barton]

Commit: 771bad9c6abaad4b742935e5d55067f281287650
Author: Campbell Barton
Date:   Wed Sep 17 09:54:33 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rB771bad9c6abaad4b742935e5d55067f281287650

Merge branch 'master' into soc-2014-viewport_context

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



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

diff --cc CMakeLists.txt
index d8e33f0,adc2b71..677150e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -323,45 -315,11 +323,47 @@@ endif(
  # Unit testsing
  option(WITH_GTESTS "Enable GTest unit testing" OFF)
  
 +# OpenGL
 +
 +option(WITH_GLEW_MX             "Support multiple GLEW contexts (experimental)"                                                                     ON )
 +option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
 +option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
 +option(WITH_GL_PROFILE_COMPAT   "Support using the OpenGL 'compatibility' profile. (deprecated)"                                                    ON )
 +option(WITH_GL_PROFILE_CORE     "Support using the OpenGL 3.2+ 'core' profile."                                                                     OFF)
 +option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (thru either EGL or the AGL/WGL/XGL 'es20' profile)"                                  OFF)
 +
 +mark_as_advanced(
 +	WITH_GLEW_MX
 +	WITH_GLEW_ES
 +	WITH_GL_EGL
 +	WITH_GL_PROFILE_COMPAT
 +	WITH_GL_PROFILE_CORE
 +	WITH_GL_PROFILE_ES20
 +)
 +
 +if (WITH_GL_PROFILE_COMPAT)
 +	set(WITH_GLU ON)
 +else()
 +	set(WITH_GLU OFF)
 +endif()
 +
 +if(WIN32)
 +	option(WITH_GL_ANGLE "Link with the ANGLE library, an OpenGL ES 2.0 implementation based on Direct3D, instead of the system OpenGL library." OFF)
 +	mark_as_advanced(WITH_GL_ANGLE)
 +endif()
 +
 +if(WITH_GLEW_ES AND WITH_SYSTEM_GLEW)
 +	message(WARNING Ignoring WITH_SYSTEM_GLEW and using WITH_GLEW_ES)
 +	set(WITH_SYSTEM_GLEW OFF)
 +endif()
 +
 +# Apple
 +
  if(APPLE)
- 	cmake_minimum_required(VERSION 2.8.8)
- 	cmake_policy(VERSION 2.8.8)
+ 	if(${CMAKE_VERSION} VERSION_LESS 3.0) # else breaks setting CMP0043 policy
+ 		cmake_minimum_required(VERSION 2.8.8)
+ 		cmake_policy(VERSION 2.8.8)
+ 	endif()
  
  	if(NOT CMAKE_OSX_ARCHITECTURES)
  		set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING