From b57c87856d6d27f9829d47f0895ab4f86b1c865f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 29 Jun 2011 19:18:08 +0000 Subject: [PATCH] Cycles: cmake changes to make win32 use lib/windows for boost and openimageio. --- intern/cycles/cmake/external_libs.cmake | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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,3 +1,18 @@ +########################################################################### +# 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 @@ -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}")