From 5689467b9a1d04742e610da8e72d2c285c219778 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 27 Sep 2011 21:25:25 +0000 Subject: Cycles: * Use different Boost versions for x86/x64 windows. Will commit OIIO and Boost for x64 windows later, needs more testing. --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7194dd4b7da..9d10f915201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -839,8 +839,13 @@ elseif(WIN32) if(WITH_BOOST) set(BOOST ${LIBDIR}/boost) set(BOOST_INCLUDE_DIR ${BOOST}/include) - set(BOOST_POSTFIX "vc90-mt-s-1_46_1.lib") - set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_46_1.lib") + if(CMAKE_CL_64) + set(BOOST_POSTFIX "vc90-mt-s-1_45.lib") + set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_45.lib") + else() + set(BOOST_POSTFIX "vc90-mt-s-1_46_1.lib") + set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_46_1.lib") + endif() set(BOOST_LIBRARIES optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX} libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX} -- cgit v1.2.3