[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28898] trunk/blender: libtiff working on linux & cmake again.

[Campbell Barton]

Revision: 28898
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28898
Author:   campbellbarton
Date:     2010-05-21 06:23:33 +0200 (Fri, 21 May 2010)

Log Message:
-----------
libtiff working on linux & cmake again.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/imbuf/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-05-21 03:25:38 UTC (rev 28897)
+++ trunk/blender/CMakeLists.txt	2010-05-21 04:23:33 UTC (rev 28898)
@@ -186,11 +186,11 @@
 		ENDIF(NOT SDL_FOUND)
 	ENDIF(WITH_SDL)
 
-    SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+	SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
 	FIND_PATH(OPENEXR_INC
 		ImfXdr.h
 		PATHS
-        ${OPENEXR}/include/OpenEXR
+		${OPENEXR}/include/OpenEXR
 		/usr/local/include/OpenEXR
 		/sw/include/OpenEXR
 		/opt/local/include/OpenEXR
@@ -216,6 +216,10 @@
 	SET(LIBSAMPLERATE_LIB samplerate)
 	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
+	IF(WITH_TIFF)
+		FIND_PACKAGE(TIFF REQUIRED)
+	ENDIF(WITH_TIFF)
+
 	FIND_PACKAGE(JPEG REQUIRED)
 
 	FIND_PACKAGE(PNG REQUIRED)
@@ -410,7 +414,7 @@
 	SET(JPEG_LIBPATH ${JPEG}/lib)
 
 	SET(TIFF ${LIBDIR}/tiff)
-	SET(TIFF_INC ${TIFF}/include)
+	SET(TIFF_INCLUDE_DIR ${TIFF}/include)
 	SET(TIFF_LIBRARY tiff)
 	SET(TIFF_LIBPATH ${TIFF}/lib)
   
@@ -481,7 +485,7 @@
 		# SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") # not used yet
 		SET(PYTHON_LIB python${PYTHON_VERSION})
 		SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
-		#    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
+		# SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
 	ELSE(PYTHON_VERSION MATCHES 3.1)
 		# otherwise, use custom system framework
 
@@ -588,7 +592,7 @@
 	SET(JPEG_LIBPATH ${JPEG}/lib)
 
 	SET(TIFF ${LIBDIR}/tiff)
-	SET(TIFF_INC ${TIFF}/include)
+	SET(TIFF_INCLUDE_DIR ${TIFF}/include)
 	SET(TIFF_LIBRARY tiff)
 	SET(TIFF_LIBPATH ${TIFF}/lib)
 

Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt	2010-05-21 03:25:38 UTC (rev 28897)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt	2010-05-21 04:23:33 UTC (rev 28898)
@@ -28,12 +28,16 @@
 
 
 SET(INC 
-	. ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib
-	../avi ../blenkernel
+	.
+	../makesdna
+	../../../intern/guardedalloc
+	../../../intern/memutil
+	../blenlib
+	../avi
+	../blenkernel
 	${JPEG_INC}
 	${PNG_INC}
 	${ZLIB_INC}
-	${OPENJPEG_INC}
 )
 
 IF(WIN32)
@@ -45,11 +49,12 @@
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_TIFF)
-	SET(INC ${INC} ${TIFF_INC})
+	SET(INC ${INC} ${TIFF_INCLUDE_DIR})
 	ADD_DEFINITIONS(-DWITH_TIFF)
 ENDIF(WITH_TIFF)
 
 IF(WITH_OPENJPEG)
+	SET(INC ${INC} ${OPENJPEG_INC})
 	ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)