diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e1ef4f5d4b..75cefd0c219 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,7 @@ mark_as_advanced(WITH_AUDASPACE) # (unix defaults to OpenMP On) -if(UNIX AND NOT APPLE) +if((UNIX AND NOT APPLE) OR (MINGW)) set(PLATFORM_DEFAULT ON) else() set(PLATFORM_DEFAULT OFF) @@ -990,9 +990,11 @@ elseif(WIN32) set(BOOST ${LIBDIR}/boost) set(BOOST_INCLUDE_DIR ${BOOST}/include) if(MSVC10) - set(BOOST_POSTFIX "vc100-mt-s-1_47.lib") - set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib") + 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() |