diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-30 18:47:57 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-30 18:47:57 +0400 |
| commit | 4ff22bd097e979e07622793d1f44d7419fb73efd (patch) | |
| tree | 8eae37d4244146d2ce9e9d82567a358176cfda77 /intern/cycles/cmake | |
| parent | b57c87856d6d27f9829d47f0895ab4f86b1c865f (diff) | |
Cycles: OS X build system changes to use lib/ openimageio and boost.
Diffstat (limited to 'intern/cycles/cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 754ea825b31..6da71c8235f 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -1,16 +1,23 @@ ########################################################################### -# Windows lib directory libraries +# Windows and Darwin lib directory libraries IF(WIN32) - if(CMAKE_CL_64) - set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64) - else() - set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows) - endif() + IF(CMAKE_CL_64) + SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64) + ELSE() + SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows) + ENDIF() +ENDIF() +IF(APPLE) + SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal) + SET(OIIO_STATIC ON) +ENDIF() + +IF(LIBDIR) SET(CYCLES_OIIO ${LIBDIR}/openimageio) SET(CYCLES_BOOST ${LIBDIR}/boost) - SET(Boost_USE_STATIC_LIBS ON) + SET(Boost_USE_STATIC_LIBS ON) ENDIF() ########################################################################### @@ -65,6 +72,25 @@ ENDIF() ADD_DEFINITIONS(-DWITH_OIIO) INCLUDE_DIRECTORIES(${OPENIMAGEIO_INCLUDES} ${OPENIMAGEIO_INCLUDES}/OpenImageIO) +IF(OIIO_STATIC) + ADD_DEFINITIONS(-DOIIO_STATIC_BUILD) + + SET(OPENIMAGEIO_LIBRARY + ${OPENIMAGEIO_LIBRARY} + ${PNG_LIBRARIES} + ${JPEG_LIBRARIES} + ${TIFF_LIBRARY} + ${OPENEXR_LIBRARIES} + ${ZLIB_LIBRARIES}) + + LINK_DIRECTORIES( + ${JPEG_LIBPATH} + ${PNG_LIBPATH} + ${TIFF_LIBPATH} + ${OPENEXR_LIBPATH} + ${ZLIB_LIBPATH}) +ENDIF() + ########################################################################### # GLUT |