libtiff working on linux & cmake again.
authorCampbell Barton <ideasman42@gmail.com>
Fri, 21 May 2010 04:23:33 +0000 (04:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 21 May 2010 04:23:33 +0000 (04:23 +0000)
CMakeLists.txt
source/blender/imbuf/CMakeLists.txt

index 57a6e8998fdeea111f3f2e48ee2017b946a44736..4b76941fb57327f7476f5ec1dee73966b2e23d3c 100644 (file)
@@ -186,11 +186,11 @@ IF(UNIX AND NOT APPLE)
                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 @@ IF(UNIX AND NOT APPLE)
        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 @@ IF(WIN32)
        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 @@ IF(APPLE)
                # 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 @@ IF(APPLE)
        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)
 
index 6940ac8514f084596acf248df1964e7ea3163c53..98cb3dcefd936781c6415c4949bc7a172c65e7f6 100644 (file)
@@ -28,12 +28,16 @@ FILE(GLOB SRC intern/*.c)
 
 
 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 @@ IF(WITH_OPENEXR)
 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)