Cycles:
authorThomas Dinges <blender@dingto.org>
Tue, 27 Sep 2011 21:25:25 +0000 (21:25 +0000)
committerThomas Dinges <blender@dingto.org>
Tue, 27 Sep 2011 21:25:25 +0000 (21:25 +0000)
* Use different Boost versions for x86/x64 windows.
Will commit OIIO and Boost for x64 windows later, needs more testing.

CMakeLists.txt

index 7194dd4b7dab397facfd33127fcfa300d8070817..9d10f915201990df05490a31d469c3f5276b0424 100644 (file)
@@ -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}