code cleanup: cmake buildsystem edits, unused var warnings and better description...

also disable workaround for some linux installs.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fb635d45d58dc95145bb660e4b632549d434331..dd843e11c8eaa3bcbae5a83203e8068775c3798d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they rea
 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 @@ set(PLATFORM_LINKFLAGS_DEBUG "")
 
 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")

diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 730b741fa389bf450de0c53e0f88ff7fb4c42b75..4bce7a6ff51c6b7e627695388c7d712225d11a40 100644 (file)
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -32,6 +32,10 @@ set(INC
        ../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        operators/bmo_bevel.c
        operators/bmo_connect.c

diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index d0093c58d23235c6b8d1819796f2fda5550a949c..653e11c80a7aeb1b6e20beb6f4a8b6d85429701e 100644 (file)
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -46,6 +46,10 @@ set(INC
        ../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        COM_compositor.h
        COM_defines.h

diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index 0c417c5dfb93e39c0613a72a37f6564c439a1cb9..7db23041c883f5adbb7c34965ff5d56893bda63c 100644 (file)
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -31,6 +31,10 @@ set(INC
        ../../collada
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        io_collada.c
        io_ops.c

diff --git a/source/blender/opencl/CMakeLists.txt b/source/blender/opencl/CMakeLists.txt
index 9c8ce8303161bb40d424dd65c796dc460fe6a6f7..6b645e02a6f55ea7f9f1ac683a799de8a1ef1dcb 100644 (file)
--- a/source/blender/opencl/CMakeLists.txt
+++ b/source/blender/opencl/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
        .
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
     OCL_opencl.h
     intern/clew.h