diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 13 |
2 files changed, 18 insertions, 9 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) diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 6940ac8514f..98cb3dcefd9 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -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) |