diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 038b61e56a6..19d1bdc9405 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON) OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON) OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON) OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) +OPTION(WITH_TIFF "Enable LibTIFF Support" ON) OPTION(WITH_DDS "Enable DDS Support" ON) OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF) OPTION(WITH_PYTHON "Enable Embedded Python API" ON) @@ -124,11 +125,9 @@ IF(UNIX AND NOT APPLE) IF(WITH_OPENAL) FIND_PACKAGE(OpenAL) - IF(OPENAL_FOUND) - SET(WITH_OPENAL ON) - ELSE(OPENAL_FOUND) + IF(NOT OPENAL_FOUND) SET(WITH_OPENAL OFF) - ENDIF(OPENAL_FOUND) + ENDIF(NOT OPENAL_FOUND) ENDIF(WITH_OPENAL) IF(WITH_JACK) @@ -185,11 +184,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 @@ -215,6 +214,13 @@ IF(UNIX AND NOT APPLE) SET(LIBSAMPLERATE_LIB samplerate) SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib) + IF(WITH_TIFF) + FIND_PACKAGE(TIFF) + IF(NOT TIFF_FOUND) + SET(WITH_TIFF OFF) + ENDIF(NOT TIFF_FOUND) + ENDIF(WITH_TIFF) + FIND_PACKAGE(JPEG REQUIRED) FIND_PACKAGE(PNG REQUIRED) @@ -409,7 +415,9 @@ 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) SET(WINTAB_INC ${LIBDIR}/wintab/include) @@ -478,7 +486,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 @@ -585,7 +593,9 @@ 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) SET(EXETYPE MACOSX_BUNDLE) |