[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48220] trunk/blender: rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.

[Campbell Barton]

Revision: 48220
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48220
Author:   campbellbarton
Date:     2012-06-23 13:42:14 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/config/blender_lite.cmake
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/extern/CMakeLists.txt
    trunk/blender/intern/cycles/cmake/external_libs.cmake
    trunk/blender/source/blender/blenlib/intern/math_color_inline.c
    trunk/blender/source/blenderplayer/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-06-23 12:48:11 UTC (rev 48219)
+++ trunk/blender/CMakeLists.txt	2012-06-23 13:42:14 UTC (rev 48220)
@@ -159,7 +159,7 @@
 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)
-	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+	option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
 
 	# freebsd doesn't seems to support XDND
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -167,7 +167,7 @@
 	endif()
 else()
 	# not an option for other OS's
-	set(WITH_BUILTIN_GLEW ON)
+	set(WITH_SYSTEM_GLEW OFF)
 endif()
 
 # Modifiers
@@ -1540,20 +1540,20 @@
 #-----------------------------------------------------------------------------
 # Configure GLEW
 
-if(WITH_BUILTIN_GLEW)
-	# set(GLEW_LIBRARY "")  # unused
-	set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
-else()
+if(WITH_SYSTEM_GLEW)
 	find_package(GLEW)
 
 	if(NOT GLEW_FOUND)
-		message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW")
+		message(FATAL_ERROR "GLEW is required to build blender, install it or disable WITH_SYSTEM_GLEW")
 	endif()
 
 	mark_as_advanced(
 		GLEW_LIBRARY
 		GLEW_INCLUDE_PATH
 	)
+else()
+	# set(GLEW_LIBRARY "")  # unused
+	set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
 endif()
 
 #-----------------------------------------------------------------------------
@@ -1791,7 +1791,7 @@
 	info_cfg_option(WITH_INSTALL_PORTABLE)
 	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XINPUT)
-	info_cfg_option(WITH_BUILTIN_GLEW)
+	info_cfg_option(WITH_SYSTEM_GLEW)
 	info_cfg_option(WITH_MEM_JEMALLOC)
 
 	info_cfg_text("Image Formats:")

Modified: trunk/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake	2012-06-23 12:48:11 UTC (rev 48219)
+++ trunk/blender/build_files/cmake/config/blender_lite.cmake	2012-06-23 13:42:14 UTC (rev 48220)
@@ -6,9 +6,9 @@
 #
 
 set(WITH_INSTALL_PORTABLE    ON  CACHE FORCE BOOL)
+set(WITH_SYSTEM_GLEW         ON  CACHE FORCE BOOL)
 
 set(WITH_BUILDINFO           OFF CACHE FORCE BOOL)
-set(WITH_BUILTIN_GLEW        OFF CACHE FORCE BOOL)
 set(WITH_BULLET              OFF CACHE FORCE BOOL)
 set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
 set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2012-06-23 12:48:11 UTC (rev 48219)
+++ trunk/blender/build_files/cmake/macros.cmake	2012-06-23 13:42:14 UTC (rev 48220)
@@ -253,7 +253,7 @@
 		endif()
 	endif()
 
-	if(NOT WITH_BUILTIN_GLEW)
+	if(WITH_SYSTEM_GLEW)
 		target_link_libraries(${target} ${GLEW_LIBRARY})
 	endif()
 

Modified: trunk/blender/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt	2012-06-23 12:48:11 UTC (rev 48219)
+++ trunk/blender/extern/CMakeLists.txt	2012-06-23 13:42:14 UTC (rev 48220)
@@ -40,7 +40,7 @@
 	add_subdirectory(binreloc)
 endif()
 
-if(WITH_BUILTIN_GLEW)
+if(NOT WITH_SYSTEM_GLEW)
 	add_subdirectory(glew)
 endif()
 

Modified: trunk/blender/intern/cycles/cmake/external_libs.cmake
===================================================================
--- trunk/blender/intern/cycles/cmake/external_libs.cmake	2012-06-23 12:48:11 UTC (rev 48219)
+++ trunk/blender/intern/cycles/cmake/external_libs.cmake	2012-06-23 13:42:14 UTC (rev 48220)
@@ -11,10 +11,10 @@
 	include_directories(${GLUT_INCLUDE_DIR})
 endif()
 
-if(WITH_BUILTIN_GLEW)
+if(WITH_SYSTEM_GLEW)
+	set(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
+else()
 	set(CYCLES_GLEW_LIBRARY extern_glew)
-else()
-	set(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
 endif()
 
 ###########################################################################

Modified: trunk/blender/source/blender/blenlib/intern/math_color_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_color_inline.c	2012-06-23 12:48:11 UTC (rev 48219)
+++ trunk/blender/source/blender/blenlib/intern/math_color_inline.c	2012-06-23 13:42:14 UTC (rev 48220)
@@ -239,6 +239,7 @@
 	return (76 * (unsigned short) rgb[0] + 148 * (unsigned short) rgb[1] + 31 * (unsigned short) rgb[2]) / 255;
 }
 
+/* luma from defined by 'YCC_JFIF', see #rgb_to_ycc */
 MINLINE float rgb_to_luma(const float rgb[3])
 {
 	return 0.299f * rgb[0] + 0.587f * rgb[1] + 0.114f * rgb[2];

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt	2012-06-23 12:48:11 UTC (rev 48219)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt	2012-06-23 13:42:14 UTC (rev 48220)
@@ -153,7 +153,7 @@
 		list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
 	endif()
 
-	if(WITH_BUILTIN_GLEW)
+	if(NOT WITH_SYSTEM_GLEW)
 		list(APPEND BLENDER_SORTED_LIBS extern_glew)
 	endif()
 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-06-23 12:48:11 UTC (rev 48219)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-06-23 13:42:14 UTC (rev 48220)
@@ -908,7 +908,7 @@
 		list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
 	endif()
 
-	if(WITH_BUILTIN_GLEW)
+	if(NOT WITH_SYSTEM_GLEW)
 		list(APPEND BLENDER_SORTED_LIBS extern_glew)
 	endif()