Added WITH_PYTHON as a cmake option

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d722d3ca9cd72540fe027877c43afeb5153cff1..2616bff79a30e9fd30a9a13ec9a2e334b3901872 100644 (file)
--- 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 47b04b1df780f511d6e262c91accd02c75e8f848..47688b675378825867c421bd5fe1d876aad455b8 100644 (file)
--- 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 30d62521d8f4213bcc9034401d0fcfc011ed30df..0680827c5487477df1804b9a7f20b22c1629634e 100644 (file)
--- 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 22e1286d2989c48c0311d241989986fd4756f3ea..19a91d08d08a8e97c2a3bb0369d8128638feb1fe 100644 (file)
--- 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 da0475cebdd4847156f378ef354238e0b17bac73..c6d1288cf4f2becb793cdbf7298158d57d864b63 100644 (file)
--- 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 7daf32361de8f8ff2c6762582fceb139cc67a048..4f8f4f38167e6d06b4532b3c6de6068bd642f8d7 100644 (file)
--- 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 8bbe328c7a30145cbdae5301848a24bc0bde927e..10830d8d0aa3398e0e45c2bd0fa7afce1b54b30e 100644 (file)
--- 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 500b04eccab1193146b486ee3f338bab9ef2bb60..ee6c841bf5a26291f762436f5d83283f098691b1 100644 (file)
--- 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 63e1a32949389230d98d9f4cf5883c109fda9a0f..5d26ccc04565d62cb48a6d97d6773bc7b5cde704 100644 (file)
--- 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})