diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-12-31 08:20:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-12-31 08:20:35 +0300 |
commit | 58c5fd7066a978af61d8287acaa7722e6de2219b (patch) | |
tree | e01d7fb6939efbd29941d3c7efd0a6198b073944 | |
parent | d1e836f75c7430e9e9b4b9cabf40e859b6d7fa78 (diff) |
Added WITH_PYTHON as a cmake option
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/editors/CMakeLists.txt | 7 | ||||
-rw-r--r-- | source/blender/editors/screen/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 7 |
9 files changed, 47 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d722d3ca9c..2616bff79a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF) 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) diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 47b04b1df78..47688b67537 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -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 @@ ENDIF(WITH_DDS) IF(WITH_QUICKTIME) SUBDIRS(quicktime) ENDIF(WITH_QUICKTIME) + +IF(WITH_PYTHON) + SUBDIRS(python) +ENDIF(WITH_PYTHON)
\ No newline at end of file diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 30d62521d8f..0680827c548 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -28,14 +28,13 @@ FILE(GLOB SRC intern/*.c) 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 @@ IF(WITH_PLAYER) SUBDIRS(bad_level_call_stubs) ENDIF(WITH_PLAYER) -ADD_DEFINITIONS(-DWITH_CCGSUBSURF) +IF(WITH_PYTHON) + SET(INC ${INC} ../python ${PYTHON_INC}) +ELSE(WITH_PYTHON) + ADD_DEFINITIONS(-DDISABLE_PYTHON) +ENDIF(WITH_PYTHON) BLENDERLIB(bf_blenkernel "${SRC}" "${INC}") diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index 22e1286d298..19a91d08d08 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -38,7 +38,6 @@ SET(INC ../windowmanager ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../nodes ../gpu - ${PYTHON_INC} ${SDL_INC} ) @@ -62,6 +61,12 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(WITH_PYTHON) + SET(INC ${INC} ${PYTHON_INC}) +ELSE(WITH_PYTHON) + ADD_DEFINITIONS(-DDISABLE_PYTHON) +ENDIF(WITH_PYTHON) + IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index da0475cebdd..c6d1288cf4f 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -36,12 +36,11 @@ SET(INC ../../windowmanager ../../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 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(WITH_PYTHON) + SET(INC ${INC} ../../python ${PYTHON_INC}) +ELSE(WITH_PYTHON) + ADD_DEFINITIONS(-DDISABLE_PYTHON) +ENDIF(WITH_PYTHON) + IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 7daf32361de..4f8f4f38167 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -27,13 +27,12 @@ FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c intern/TEX_no 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 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(WITH_PYTHON) + SET(INC ${INC} ../python ${PYTHON_INC}) +ELSE(WITH_PYTHON) + ADD_DEFINITIONS(-DDISABLE_PYTHON) +ENDIF(WITH_PYTHON) + ADD_DEFINITIONS(-DWITH_CCGSUBSURF) BLENDERLIB(bf_nodes "${SRC}" "${INC}") diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 8bbe328c7a3..10830d8d0aa 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -32,13 +32,12 @@ SET(INC . ../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 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) +IF(WITH_PYTHON) + SET(INC ${INC} ../python ${PYTHON_INC}) +ELSE(WITH_PYTHON) + ADD_DEFINITIONS(-DDISABLE_PYTHON) +ENDIF(WITH_PYTHON) + IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 500b04eccab..ee6c841bf5a 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -65,7 +65,9 @@ #include "radio.h" +#ifndef DISABLE_PYTHON #include "BPY_extern.h" +#endif #include "SYS_System.h" diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 63e1a329493..5d26ccc0456 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -38,7 +38,6 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc ../blender/imbuf ../blender/renderconverter ../blender/render/extern/include - ../blender/python ../blender/makesdna ../blender/gpu ../blender/windowmanager @@ -57,6 +56,12 @@ IF(WITH_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) ENDIF(WITH_OPENEXR) +IF(WITH_PYTHON) + INCLUDE_DIRECTORIES(../blender/python) +ELSE(WITH_PYTHON) + ADD_DEFINITIONS(-DDISABLE_PYTHON) +ENDIF(WITH_PYTHON) + IF(LINUX) ADD_DEFINITIONS(-DWITH_BINRELOC) INCLUDE_DIRECTORIES(${BINRELOC_INC}) |