[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40636] branches/cycles/CMakeLists.txt: Cycles:

[Thomas Dinges]

Revision: 40636
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40636
Author:   dingto
Date:     2011-09-27 21:25:25 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Cycles:
* Use different Boost versions for x86/x64 windows. 
Will commit OIIO and Boost for x64 windows later, needs more testing. 

Modified Paths:
--------------
    branches/cycles/CMakeLists.txt

Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt	2011-09-27 21:05:33 UTC (rev 40635)
+++ branches/cycles/CMakeLists.txt	2011-09-27 21:25:25 UTC (rev 40636)
@@ -839,8 +839,13 @@
 		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}