diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-07-04 20:39:34 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-07-04 20:39:34 +0400 |
| commit | 6829f613c27012f7095817b2b7464f4d72d8927b (patch) | |
| tree | f861161bb0d140063f7487605bdac7cd39fe46e2 /CMakeLists.txt | |
| parent | 04343ecd8ce39333628b5be0c2eeb10b3dd5ef51 (diff) | |
Cmake / Boost:
* Code cleanup
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index acc94dfa969..7a504b0a986 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -990,9 +990,11 @@ elseif(WIN32) set(BOOST ${LIBDIR}/boost) set(BOOST_INCLUDE_DIR ${BOOST}/include) if(MSVC10) + set(BOOST_LIBPATH ${BOOST}/lib/vc_10) set(BOOST_POSTFIX "vc100-mt-s-1_49.lib") set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.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") endif() @@ -1001,11 +1003,6 @@ elseif(WIN32) optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX} debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX} debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX}) - if(MSVC10) - set(BOOST_LIBPATH ${BOOST}/lib/vc_10) - else() - set(BOOST_LIBPATH ${BOOST}/lib) - endif() set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB") endif() |