[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23590] trunk/blender/source/blender: Fix cmake compilation on Windows, adding pthread includes,

Brecht Van Lommel brecht at blender.org
Thu Oct 1 19:24:24 CEST 2009


Revision: 23590
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23590
Author:   blendix
Date:     2009-10-01 19:24:24 +0200 (Thu, 01 Oct 2009)

Log Message:
-----------
Fix cmake compilation on Windows, adding pthread includes,
patch by Guillaume, thanks!

Modified Paths:
--------------
    trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
    trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
    trunk/blender/source/blender/nodes/CMakeLists.txt
    trunk/blender/source/blender/render/CMakeLists.txt

Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt	2009-10-01 17:15:23 UTC (rev 23589)
+++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt	2009-10-01 17:24:24 UTC (rev 23590)
@@ -30,6 +30,10 @@
 	. .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
 )
 
+IF(WIN32)
+	SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
 IF(WITH_QUICKTIME)
 	SET(INC ${INC} ${QUICKTIME_INC})
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)

Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2009-10-01 17:15:23 UTC (rev 23589)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2009-10-01 17:24:24 UTC (rev 23590)
@@ -42,6 +42,10 @@
 INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna ../../blenkernel ../../blenlib ../../ikplugin ../../windowmanager ../../editors/include ../../imbuf ../../render/extern/include .)
 FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 
+IF(WIN32)
+	SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
 IF(WITH_GAMEENGINE)
 	ADD_DEFINITIONS(-DGAMEBLENDER)
 ENDIF(WITH_GAMEENGINE)

Modified: trunk/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/nodes/CMakeLists.txt	2009-10-01 17:15:23 UTC (rev 23589)
+++ trunk/blender/source/blender/nodes/CMakeLists.txt	2009-10-01 17:24:24 UTC (rev 23590)
@@ -34,6 +34,10 @@
 	${ZLIB_INC}
 )
 
+IF(WIN32)
+	SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
 IF(WITH_OPENEXR)
 	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)

Modified: trunk/blender/source/blender/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/render/CMakeLists.txt	2009-10-01 17:15:23 UTC (rev 23589)
+++ trunk/blender/source/blender/render/CMakeLists.txt	2009-10-01 17:24:24 UTC (rev 23590)
@@ -34,6 +34,10 @@
 	../makesrna
 )
 
+IF(WIN32)
+	SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
 IF(WITH_OPENEXR)
 	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)





More information about the Bf-blender-cvs mailing list