[Bf-blender-cvs] [cbc7220] arcpatch-D261: patch by Mihai Melinescu: boost hardcoded MSVC12

Martijn Berger noreply at git.blender.org
Mon Jan 27 09:06:18 CET 2014


Commit: cbc7220d7f0926df795fc64803e58c681fc99dd7
Author: Martijn Berger
Date:   Mon Jan 27 09:01:49 2014 +0100
https://developer.blender.org/rBcbc7220d7f0926df795fc64803e58c681fc99dd7

patch by Mihai Melinescu: boost hardcoded MSVC12

Updated CMakeLists.txt to account for boost hardcoded locations for VS 2013.

Reviewers: juicyfruit

Differential Revision: https://developer.blender.org/D261

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac2643b..ce4a11c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1202,7 +1202,11 @@ elseif(WIN32)
 				message(WARNING "USING HARDCODED boost locations")
 				set(BOOST ${LIBDIR}/boost)
 				set(BOOST_INCLUDE_DIR ${BOOST}/include)
-				if(MSVC11)
+				if(MSVC12)
+					set(BOOST_LIBPATH ${BOOST}/lib)
+					set(BOOST_POSTFIX "vc120-mt-s-1_55.lib")
+					set(BOOST_DEBUG_POSTFIX "vc120-mt-sgd-1_55.lib")
+				elseif(MSVC11)
 					set(BOOST_LIBPATH ${BOOST}/lib)
 					set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
 					set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")




More information about the Bf-blender-cvs mailing list