Use new libs on win32/64. Make sure you update lib/windows or lib/win64.
This commit is contained in:
Thomas Dinges
2011-11-06 14:09:08 +00:00
parent fd83a3ede0
commit 3bf96250cd

View File

@@ -838,13 +838,8 @@ elseif(WIN32)
if(WITH_BOOST) if(WITH_BOOST)
set(BOOST ${LIBDIR}/boost) set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include) set(BOOST_INCLUDE_DIR ${BOOST}/include)
if(CMAKE_CL_64) set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
set(BOOST_POSTFIX "vc90-mt-s-1_45.lib") set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.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 set(BOOST_LIBRARIES
optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX} optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX} libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}