diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-05-21 08:23:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-05-21 08:23:33 +0400 |
| commit | 418f1fcba887c1582a0a199a9194efb51aac5419 (patch) | |
| tree | 9f748949d491853088091419920e7214d7e4ef9b /CMakeLists.txt | |
| parent | 2be851c9665caab9e858f4c06ec59e7bb4201e17 (diff) | |
libtiff working on linux & cmake again.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 57a6e8998fd..4b76941fb57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) |