[Bf-blender-cvs] [8b96d6a] soc-2014-viewport_context: removed support for building with GLX on OSX

[Jason Wilkins]

Commit: 8b96d6a5422d3079ac5c8e7de83b87bbfde0d7e9
Author: Jason Wilkins
Date:   Mon Jul 28 13:44:48 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB8b96d6a5422d3079ac5c8e7de83b87bbfde0d7e9

removed support for building with GLX on OSX

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b63129b..9db6ab7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,22 +165,12 @@ option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)"
 
 if(UNIX AND NOT APPLE)
 	set(WITH_X11 ON)
-else()
-	option(WITH_X11_DEVEL_TEST "Use X11 library (for development purposes only)" OFF)
-	mark_as_advanced(WITH_X11_DEVEL_TEST)
-	set(WITH_X11 ${WITH_X11_DEVEL_TEST})
 endif()
 
 if(WITH_X11)
-	if(UNIX AND NOT APPLE)
-		option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)" ON)
-		option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                      ON)
-	else()
-		set(WITH_X11_XINPUT    OFF)
-		set(WITH_X11_XF86VMODE OFF)
-	endif()
-
-	option(WITH_GHOST_XDND "Enable drag'n'drop support on X11 using XDND protocol" ON)
+	option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)"  ON)
+	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                       ON)
+	option(WITH_GHOST_XDND    "Enable drag'n'drop support on X11 using XDND protocol" ON)
 endif()
 
 if(UNIX AND NOT APPLE)
@@ -2092,12 +2082,7 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 
-if(APPLE AND WITH_X11)
-	set(OPENGL_gl_LIBRARY  "/usr/X11R6/lib/libGL.dylib")
-	set(OPENGL_glu_LIBRARY "/usr/X11R6/lib/libGLU.dylib")
-else()
-	find_package(OpenGL)
-endif()
+find_package(OpenGL)
 
 if(WITH_GLU)
 	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_glu_LIBRARY}")
@@ -2217,10 +2202,6 @@ if(WITH_GLEW_MX)
 	list(APPEND GL_DEFINITIONS -DWITH_GLEW_MX)
 endif()
 
-if(APPLE AND WITH_X11)
-	list(APPEND GL_DEFINITIONS -DGLEW_APPLE_GLX)
-endif()
-
 if(WITH_SYSTEM_GLEW)
 	find_package(GLEW)