From 25f59c8e0b6d685634cf732648e496540eb6ea68 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 Jun 2012 08:51:02 +0000 Subject: code cleanup: cmake buildsystem edits, unused var warnings and better description for WITH_PYTHON_MODULE. also disable workaround for some linux installs. --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'CMakeLists.txt') 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") -- cgit v1.2.3