[Bf-blender-cvs] [b69f0479a4] blender2.8: OpenGL: remove GLU option from build system

[Mike Erwin]

Commit: b69f0479a421baaba1660289d781eaafa1f07673
Author: Mike Erwin
Date:   Wed Mar 22 21:33:19 2017 -0400
Branches: blender2.8
https://developer.blender.org/rBb69f0479a421baaba1660289d781eaafa1f07673

OpenGL: remove GLU option from build system

Also remove linking in glu libs.

T49042 is now done!

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

M	CMakeLists.txt
M	intern/ghost/test/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4caedbab6d..4fe6df2c67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -474,12 +474,6 @@ mark_as_advanced(
 	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)
@@ -1058,11 +1052,6 @@ endif()
 find_package(OpenGL)
 blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
 
-if(WITH_GLU)
-	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_glu_LIBRARY}")
-	list(APPEND GL_DEFINITIONS -DWITH_GLU)
-endif()
-
 if(WITH_SYSTEM_GLES)
 	find_package_wrapper(OpenGLES)
 endif()
@@ -1290,9 +1279,7 @@ else()
 
 endif()
 
-if(NOT WITH_GLU)
-	list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
-endif()
+list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
 
 #-----------------------------------------------------------------------------
 # Configure Bullet
@@ -1800,7 +1787,6 @@ if(FIRST_RUN)
 
 	info_cfg_text("OpenGL:")
 	info_cfg_option(WITH_GLEW_ES)
-	info_cfg_option(WITH_GLU)
 	info_cfg_option(WITH_GL_EGL)
 	info_cfg_option(WITH_GL_PROFILE_COMPAT)
 	info_cfg_option(WITH_GL_PROFILE_CORE)
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index fb9ef621ec..ef6e891587 100644
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@ -203,7 +203,6 @@ target_link_libraries(gears_c
 		glewmx_lib
 		string_lib
 		${OPENGL_gl_LIBRARY}
-		${OPENGL_glu_LIBRARY}
 		${PLATFORM_LINKLIBS}
 		)
 
@@ -217,7 +216,6 @@ target_link_libraries(gears_cpp
 		glewmx_lib
 		string_lib
 		${OPENGL_gl_LIBRARY}
-		${OPENGL_glu_LIBRARY}
 		${PLATFORM_LINKLIBS}
 		)
 
@@ -248,7 +246,6 @@ target_link_libraries(multitest_c
 		guardedalloc_lib
 		wcwidth_lib
 		${OPENGL_gl_LIBRARY}
-		${OPENGL_glu_LIBRARY}
 		${FREETYPE_LIBRARY}
 		${ZLIB_LIBRARIES}
 		${PLATFORM_LINKLIBS}