[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48221] trunk/blender: add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed .

[Campbell Barton]

Revision: 48221
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48221
Author:   campbellbarton
Date:     2012-06-23 14:23:44 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/extern/CMakeLists.txt
    trunk/blender/extern/libopenjpeg/image.c

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-06-23 13:42:14 UTC (rev 48220)
+++ trunk/blender/CMakeLists.txt	2012-06-23 14:23:44 UTC (rev 48221)
@@ -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_SYSTEM_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+	option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" ON)
 
 	# freebsd doesn't seems to support XDND
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -170,6 +170,17 @@
 	set(WITH_SYSTEM_GLEW OFF)
 endif()
 
+
+# (unix defaults to System OpenJPEG On)
+if(UNIX AND NOT APPLE)
+	set(PLATFORM_DEFAULT ON)
+else()
+	set(PLATFORM_DEFAULT OFF)
+endif()
+option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" ${PLATFORM_DEFAULT})
+unset(PLATFORM_DEFAULT)
+
+
 # Modifiers
 option(WITH_MOD_FLUID        	"Enable Elbeem Modifier (Fluid Simulation)" ON)
 option(WITH_MOD_SMOKE        	"Enable Smoke Modifier (Smoke Simulation)" ON)
@@ -1485,7 +1496,7 @@
 
 
 if(WITH_IMAGE_OPENJPEG)
-	if(UNIX AND NOT APPLE)
+	if(WITH_SYSTEM_OPENJPEG)
 		# dealt with above
 	else()
 		set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
@@ -1791,8 +1802,9 @@
 	info_cfg_option(WITH_INSTALL_PORTABLE)
 	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XINPUT)
+	info_cfg_option(WITH_MEM_JEMALLOC)
 	info_cfg_option(WITH_SYSTEM_GLEW)
-	info_cfg_option(WITH_MEM_JEMALLOC)
+	info_cfg_option(WITH_SYSTEM_OPENJPEG)
 
 	info_cfg_text("Image Formats:")
 	info_cfg_option(WITH_IMAGE_CINEON)

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2012-06-23 13:42:14 UTC (rev 48220)
+++ trunk/blender/build_files/cmake/macros.cmake	2012-06-23 14:23:44 UTC (rev 48221)
@@ -193,7 +193,7 @@
 	if(WITH_OPENIMAGEIO)
 		link_directories(${OPENIMAGEIO_LIBPATH})
 	endif()
-	if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+	if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
 		link_directories(${OPENJPEG_LIBPATH})
 	endif()
 	if(WITH_CODEC_QUICKTIME)
@@ -303,7 +303,7 @@
 			target_link_libraries(${target} ${OPENEXR_LIBRARIES})
 		endif()
 	endif()
-	if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+	if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
 		target_link_libraries(${target} ${OPENJPEG_LIBRARIES})
 	endif()
 	if(WITH_CODEC_FFMPEG)

Modified: trunk/blender/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt	2012-06-23 13:42:14 UTC (rev 48220)
+++ trunk/blender/extern/CMakeLists.txt	2012-06-23 14:23:44 UTC (rev 48221)
@@ -48,7 +48,7 @@
 	add_subdirectory(recastnavigation)
 endif()
 
-if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
+if(WITH_IMAGE_OPENJPEG AND (NOT WITH_SYSTEM_OPENJPEG))
 	add_subdirectory(libopenjpeg)
 endif()
 

Modified: trunk/blender/extern/libopenjpeg/image.c
===================================================================
--- trunk/blender/extern/libopenjpeg/image.c	2012-06-23 13:42:14 UTC (rev 48220)
+++ trunk/blender/extern/libopenjpeg/image.c	2012-06-23 14:23:44 UTC (rev 48221)
@@ -86,4 +86,3 @@
 		opj_free(image);
 	}
 }
-