code cleanup: cmake buildsystem edits, unused var warnings and better description for WITH_PYTHON_MODULE.
also disable workaround for some linux installs.
This commit is contained in:
@@ -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.
|
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_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_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_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)
|
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)
|
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
|
# set lib directory if it exists
|
||||||
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||||
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
||||||
|
@@ -32,6 +32,10 @@ set(INC
|
|||||||
../../../intern/guardedalloc
|
../../../intern/guardedalloc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(INC_SYS
|
||||||
|
|
||||||
|
)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
operators/bmo_bevel.c
|
operators/bmo_bevel.c
|
||||||
operators/bmo_connect.c
|
operators/bmo_connect.c
|
||||||
|
@@ -46,6 +46,10 @@ set(INC
|
|||||||
../../../intern/guardedalloc
|
../../../intern/guardedalloc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(INC_SYS
|
||||||
|
|
||||||
|
)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
COM_compositor.h
|
COM_compositor.h
|
||||||
COM_defines.h
|
COM_defines.h
|
||||||
|
@@ -31,6 +31,10 @@ set(INC
|
|||||||
../../collada
|
../../collada
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(INC_SYS
|
||||||
|
|
||||||
|
)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
io_collada.c
|
io_collada.c
|
||||||
io_ops.c
|
io_ops.c
|
||||||
|
@@ -28,6 +28,10 @@ set(INC
|
|||||||
.
|
.
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(INC_SYS
|
||||||
|
|
||||||
|
)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
OCL_opencl.h
|
OCL_opencl.h
|
||||||
intern/clew.h
|
intern/clew.h
|
||||||
|
Reference in New Issue
Block a user