- added back zlib include (needed for win32).

- use list append in more places. - remove non existing include dir.
2010-09-07 01:13:10 +00:00
parent e0aca888de
commit 2406ebe1a4
34 changed files with 105 additions and 92 deletions
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(INC
 	../gpu
 	../../../intern/ghost
 	../../../intern/guardedalloc
+	${ZLIB_INC}
 	${FREETYPE_INCLUDE_DIRS}
 )

@@ -45,7 +46,7 @@ SET(INC
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")

 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)

 IF(WITH_OPENMP)