Cmake / Boost:
[blender.git] / CMakeLists.txt
index acc94dfa969ad8474a8d819cd8a84efba7fb904e..7a504b0a986bd09129f82ceffc12a9c86314cc76 100644 (file)
@@ -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()