Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2015-12-29 20:59:23 +0300
committerMartijn Berger <martijn.berger@gmail.com>2015-12-29 20:59:23 +0300
commit5e974a350f84ec354749878967a46e0b4a06c45d (patch)
tree7c3b59fc2dddb0a7cff5b597674c6224005290ee /CMakeLists.txt
parenta6b67ca802e274e67cc294218a2ae1fcf8378f81 (diff)
Make cycles compile with MSVC 2015
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d4fb2b7254..79844bb0e50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1486,8 +1486,8 @@ elseif(WIN32)
set(BOOST_DEBUG_POSTFIX "vc120-mt-sgd-1_55.lib")
else()
set(BOOST_LIBPATH ${BOOST}/lib)
- set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
- set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")
+ set(BOOST_POSTFIX "vc140-mt-s-1_60.lib")
+ set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-1_60.lib")
endif()
set(BOOST_LIBRARIES
optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}