[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18192] branches/blender2.5/blender: Added WITH_PYTHON as a cmake option
Campbell Barton
ideasman42 at gmail.com
Wed Dec 31 06:20:35 CET 2008
Revision: 18192
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18192
Author: campbellbarton
Date: 2008-12-31 06:20:35 +0100 (Wed, 31 Dec 2008)
Log Message:
-----------
Added WITH_PYTHON as a cmake option
Modified Paths:
--------------
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/blender2.5/blender/source/creator/CMakeLists.txt
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/CMakeLists.txt 2008-12-31 05:20:35 UTC (rev 18192)
@@ -63,7 +63,7 @@
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
OPTION(WITH_DDS "Enable DDS Support" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
-OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
+OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
Modified: branches/blender2.5/blender/source/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/CMakeLists.txt 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/source/blender/CMakeLists.txt 2008-12-31 05:20:35 UTC (rev 18192)
@@ -24,7 +24,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna python radiosity readblenfile render yafray)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna radiosity readblenfile render yafray)
IF(WITH_INTERNATIONAL)
SUBDIRS(ftfont)
@@ -41,3 +41,7 @@
IF(WITH_QUICKTIME)
SUBDIRS(quicktime)
ENDIF(WITH_QUICKTIME)
+
+IF(WITH_PYTHON)
+ SUBDIRS(python)
+ENDIF(WITH_PYTHON)
\ No newline at end of file
Modified: branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt 2008-12-31 05:20:35 UTC (rev 18192)
@@ -28,14 +28,13 @@
SET(INC
. ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna
- ../python ../render/extern/include ../../../intern/decimation/extern
+ ../render/extern/include ../../../intern/decimation/extern
../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
../../../intern/iksolver/extern ../blenloader ../quicktime
../../../intern/bmfont ../../../extern/bullet2/src
../nodes ../../../extern/glew/include ../gpu ../makesrna
${SDL_INC}
${ZLIB_INC}
- ${PYTHON_INC}
)
IF(WITH_VERSE)
@@ -65,7 +64,11 @@
SUBDIRS(bad_level_call_stubs)
ENDIF(WITH_PLAYER)
-ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
+IF(WITH_PYTHON)
+ SET(INC ../python ${PYTHON_INC})
+ELSE(WITH_PYTHON)
+ ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
Modified: branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/CMakeLists.txt 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/source/blender/editors/CMakeLists.txt 2008-12-31 05:20:35 UTC (rev 18192)
@@ -38,7 +38,6 @@
../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
../nodes
../gpu
- ${PYTHON_INC}
${SDL_INC}
)
@@ -62,6 +61,12 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
+IF(WITH_PYTHON)
+ SET(INC ../python ${PYTHON_INC})
+ELSE(WITH_PYTHON)
+ ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
+
IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC})
ENDIF(WIN32)
Modified: branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt 2008-12-31 05:20:35 UTC (rev 18192)
@@ -36,12 +36,11 @@
../../include ../../../../intern/bmfont ../../imbuf
../../render/extern/include ../../../../intern/bsp/extern
../../radiosity/extern/include
- ../../../intern/decimation/extern ../../blenloader ../../python
+ ../../../intern/decimation/extern ../../blenloader
../../../kernel/gen_system ../../../../intern/SoundSystem ../../readstreamglue
../../quicktime ../../../../intern/elbeem/extern
../../../../intern/ghost ../../../../intern/opennl/extern
../../nodes
- ${PYTHON_INC}
${SDL_INC}
)
@@ -65,6 +64,12 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
+IF(WITH_PYTHON)
+ SET(INC ../../python ${PYTHON_INC})
+ELSE(WITH_PYTHON)
+ ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
+
IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC})
ENDIF(WIN32)
Modified: branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt 2008-12-31 05:20:35 UTC (rev 18192)
@@ -27,13 +27,12 @@
SET(INC
. ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna
- ../python ../render/extern/include ../../../intern/decimation/extern
+ ../render/extern/include ../../../intern/decimation/extern
../imbuf ../avi ../../../intern/elbeem/extern
../../../intern/iksolver/extern ../blenloader ../quicktime
../blenkernel ../../../extern/glew/include ../gpu
${SDL_INC}
${ZLIB_INC}
- ${PYTHON_INC}
)
IF(WITH_VERSE)
@@ -55,6 +54,12 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
+IF(WITH_PYTHON)
+ SET(INC ../python ${PYTHON_INC})
+ELSE(WITH_PYTHON)
+ ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
+
ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
BLENDERLIB(bf_nodes "${SRC}" "${INC}")
Modified: branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt 2008-12-31 05:20:35 UTC (rev 18192)
@@ -32,13 +32,12 @@
../blenlib ../makesdna ../makesrna ../blenkernel
../include ../../../intern/bmfont ../imbuf ../render/extern/include
../../../intern/bsp/extern ../radiosity/extern/include
- ../../../intern/decimation/extern ../blenloader ../python
+ ../../../intern/decimation/extern ../blenloader
../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
../quicktime ../../../intern/elbeem/extern
../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
../nodes
../gpu
- ${PYTHON_INC}
${SDL_INC}
)
@@ -62,6 +61,12 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
+IF(WITH_PYTHON)
+ SET(INC ../python ${PYTHON_INC})
+ELSE(WITH_PYTHON)
+ ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
+
IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC})
ENDIF(WIN32)
Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c 2008-12-31 05:20:35 UTC (rev 18192)
@@ -65,7 +65,9 @@
#include "radio.h"
+#ifndef DISABLE_PYTHON
#include "BPY_extern.h"
+#endif
#include "SYS_System.h"
Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt 2008-12-31 05:08:04 UTC (rev 18191)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt 2008-12-31 05:20:35 UTC (rev 18192)
@@ -38,7 +38,6 @@
../blender/imbuf
../blender/renderconverter
../blender/render/extern/include
- ../blender/python
../blender/makesdna
../blender/gpu
../blender/windowmanager
@@ -57,6 +56,12 @@
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_OPENEXR)
+IF(WITH_PYTHON)
+ SET(INC ../blender/python)
+ELSE(WITH_PYTHON)
+ ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
+
IF(LINUX)
ADD_DEFINITIONS(-DWITH_BINRELOC)
INCLUDE_DIRECTORIES(${BINRELOC_INC})
More information about the Bf-blender-cvs
mailing list