diff options
| author | Thomas Dinges <blender@dingto.org> | 2011-09-28 01:25:25 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2011-09-28 01:25:25 +0400 |
| commit | 5689467b9a1d04742e610da8e72d2c285c219778 (patch) | |
| tree | ec296afae375412bf13aa495173c1a7139e6f8eb /CMakeLists.txt | |
| parent | e6dfbcf7cbd3cc708b5dfc8f29f790fd0c0c8735 (diff) | |
Cycles:
* Use different Boost versions for x86/x64 windows.
Will commit OIIO and Boost for x64 windows later, needs more testing.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7194dd4b7da..9d10f915201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} |