diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/compositor/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/io/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/opencl/CMakeLists.txt | 4 |
5 files changed, 17 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fb635d45d5..dd843e11c8e 100644 --- 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 730b741fa38..4bce7a6ff51 100644 --- 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 d0093c58d23..653e11c80a7 100644 --- 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 0c417c5dfb9..7db23041c88 100644 --- 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 9c8ce830316..6b645e02a6f 100644 --- 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 |