diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-29 23:18:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-29 23:18:08 +0400 |
| commit | b57c87856d6d27f9829d47f0895ab4f86b1c865f (patch) | |
| tree | 2a77e669fcf95b6650b3de128403ef9a97ae7259 /intern/cycles/cmake | |
| parent | b1637e3201e52a5fb8f3459438c3e5333a5432be (diff) | |
Cycles: cmake changes to make win32 use lib/windows for boost and openimageio.
Diffstat (limited to 'intern/cycles/cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index dda24961339..754ea825b31 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -1,4 +1,19 @@ ########################################################################### +# Windows 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() + + SET(CYCLES_OIIO ${LIBDIR}/openimageio) + SET(CYCLES_BOOST ${LIBDIR}/boost) + SET(Boost_USE_STATIC_LIBS ON) +ENDIF() + +########################################################################### # Boost setup SET(BOOST_ROOT ${CYCLES_BOOST}) @@ -11,7 +26,7 @@ SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44" SET(Boost_USE_MULTITHREADED ON) -FIND_PACKAGE(Boost 1.34 REQUIRED COMPONENTS filesystem regex system serialization thread) +FIND_PACKAGE(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread) MESSAGE(STATUS "Boost found ${Boost_FOUND}") MESSAGE(STATUS "Boost version ${Boost_VERSION}") |