[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48363] trunk/blender: code cleanup: cmake buildsystem edits, unused var warnings and better description for WITH_PYTHON_MODULE.

[Campbell Barton]

Revision: 48363
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48363
Author:   campbellbarton
Date:     2012-06-28 08:51:02 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
code cleanup: cmake buildsystem edits, unused var warnings and better description for WITH_PYTHON_MODULE.
also disable workaround for some linux installs.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/bmesh/CMakeLists.txt
    trunk/blender/source/blender/compositor/CMakeLists.txt
    trunk/blender/source/blender/editors/io/CMakeLists.txt
    trunk/blender/source/blender/opencl/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-06-28 08:47:22 UTC (rev 48362)
+++ trunk/blender/CMakeLists.txt	2012-06-28 08:51:02 UTC (rev 48363)
@@ -123,7 +123,7 @@
 mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
-option(WITH_PYTHON_MODULE "Enable building as a python module (experimental, only enable for development)" OFF)
+option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
@@ -462,11 +462,6 @@
 
 if(UNIX AND NOT APPLE)
 
-	# needed for ubuntu 11.04
-	if(EXISTS "/usr/lib/x86_64-linux-gnu")
-		set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
-	endif()
-
 	# set lib directory if it exists
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")

Modified: trunk/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/bmesh/CMakeLists.txt	2012-06-28 08:47:22 UTC (rev 48362)
+++ trunk/blender/source/blender/bmesh/CMakeLists.txt	2012-06-28 08:51:02 UTC (rev 48363)
@@ -32,6 +32,10 @@
 	../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	operators/bmo_bevel.c
 	operators/bmo_connect.c

Modified: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/compositor/CMakeLists.txt	2012-06-28 08:47:22 UTC (rev 48362)
+++ trunk/blender/source/blender/compositor/CMakeLists.txt	2012-06-28 08:51:02 UTC (rev 48363)
@@ -46,6 +46,10 @@
 	../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	COM_compositor.h
 	COM_defines.h

Modified: trunk/blender/source/blender/editors/io/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/io/CMakeLists.txt	2012-06-28 08:47:22 UTC (rev 48362)
+++ trunk/blender/source/blender/editors/io/CMakeLists.txt	2012-06-28 08:51:02 UTC (rev 48363)
@@ -31,6 +31,10 @@
 	../../collada
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	io_collada.c
 	io_ops.c

Modified: trunk/blender/source/blender/opencl/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/opencl/CMakeLists.txt	2012-06-28 08:47:22 UTC (rev 48362)
+++ trunk/blender/source/blender/opencl/CMakeLists.txt	2012-06-28 08:51:02 UTC (rev 48363)
@@ -28,6 +28,10 @@
 	.
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
     OCL_opencl.h
     intern/clew.h