diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-01-27 12:24:44 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-01-27 12:24:44 +0400 |
| commit | e5b14988347317a8b4b8182f81782bad81a0d35a (patch) | |
| tree | 25419fa67355370848d3f391d9db208fd6def625 /CMakeLists.txt | |
| parent | 029a7bbade920385a4852484cc19b138be8a9558 (diff) | |
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
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ac2643bbea1..ce4a11cf8e5 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") |