[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18193] branches/blender2.5/blender/source : previous commit was wrong, somehow worked for me but not from a clean build

Tue, 30 Dec 2008 22:23:10 -0800 

Revision: 18193
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18193
Author:   campbellbarton
Date:     2008-12-31 07:23:30 +0100 (Wed, 31 Dec 2008)

Log Message:
-----------
previous commit was wrong, somehow worked for me but not from a clean build

Modified Paths:
--------------
    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/creator/CMakeLists.txt

Modified: branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt        
2008-12-31 05:20:35 UTC (rev 18192)
+++ branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt        
2008-12-31 06:23:30 UTC (rev 18193)
@@ -65,7 +65,7 @@
 ENDIF(WITH_PLAYER)
 
 IF(WITH_PYTHON)
-  SET(INC ../python ${PYTHON_INC})
+  SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)

Modified: branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/CMakeLists.txt   
2008-12-31 05:20:35 UTC (rev 18192)
+++ branches/blender2.5/blender/source/blender/editors/CMakeLists.txt   
2008-12-31 06:23:30 UTC (rev 18193)
@@ -62,7 +62,7 @@
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ../python ${PYTHON_INC})
+  SET(INC ${INC} ${PYTHON_INC})
 ELSE(WITH_PYTHON)
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)

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:20:35 UTC (rev 18192)
+++ branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt    
2008-12-31 06:23:30 UTC (rev 18193)
@@ -65,7 +65,7 @@
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ../../python ${PYTHON_INC})
+  SET(INC ${INC} ../../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)

Modified: branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt     
2008-12-31 05:20:35 UTC (rev 18192)
+++ branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt     
2008-12-31 06:23:30 UTC (rev 18193)
@@ -55,7 +55,7 @@
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ../python ${PYTHON_INC})
+  SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)

Modified: 
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt     
2008-12-31 05:20:35 UTC (rev 18192)
+++ branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt     
2008-12-31 06:23:30 UTC (rev 18193)
@@ -62,7 +62,7 @@
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-  SET(INC ../python ${PYTHON_INC})
+  SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)

Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt   2008-12-31 
05:20:35 UTC (rev 18192)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt   2008-12-31 
06:23:30 UTC (rev 18193)
@@ -57,7 +57,7 @@
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_PYTHON)
-  SET(INC ../blender/python)
+  INCLUDE_DIRECTORIES(../blender/python)
 ELSE(WITH_PYTHON)
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to