diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2010-07-03 14:01:41 +0400 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2010-07-03 14:01:41 +0400 |
| commit | ec770b75382bb6fcb718d902593d6175a15333f3 (patch) | |
| tree | cc3876b31723029ee55b8047f1e1e6b55300afae | |
| parent | de3dc3349467a3095293e874690a5c2ff69b7561 (diff) | |
OSX: CMake and scons default settings updated to allow build with LCMS lib
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | config/darwin-config.py | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fedca9ba1ba..59e4b798a6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -711,7 +711,12 @@ IF(APPLE) SET(OPENEXR_LIBPATH ${OPENEXR}/lib) ENDIF(WITH_OPENEXR) - # TODO: IF(WITH_LCMS) + IF(WITH_LCMS) + SET(LCMS ${LIBDIR}/lcms) + SET(LCMS_INCLUDE_DIR ${LCMS}/include) + SET(LCMS_LIBRARY lcms) + SET(LCMS_LIBPATH ${LCMS}/lib) + ENDIF(WITH_LCMS) IF(WITH_FFMPEG) SET(FFMPEG ${LIBDIR}/ffmpeg) diff --git a/config/darwin-config.py b/config/darwin-config.py index 2c3d0a7e87e..a9a2582fc68 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -151,6 +151,9 @@ BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf WITH_BF_DDS = True +#Color Management System +WITH_BF_LCMS = True + WITH_BF_JPEG = True BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' |