diff --git a/CMakeLists.txt b/CMakeLists.txt index 341e8158..d3f5d3b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,14 +131,14 @@ else() STRING(REGEX REPLACE "\\\\" "/" BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR}) if(${WINXXBITS} STREQUAL "Win32") - set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib32-msvc-14") + set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib32-msvc-14.0") else() - set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib64-msvc-14") + set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib64-msvc-14.0") endif() set(Boost_NO_SYSTEM_PATHS ON) endif() -find_package(Boost 1.64 COMPONENTS system program_options filesystem date_time REQUIRED) +find_package(Boost 1.68 COMPONENTS system program_options filesystem date_time REQUIRED) # Botan ------------------------------------------------------------------------ diff --git a/README.md b/README.md index 7bbbe45d..e6b4761e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ * QT 5.10.1 * CxxTest 4.3 * Clang & LLVM 6.0 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html) -* Boost 1.64 +* Boost 1.68 * Botan 2.1.0 * Image Magick 7.0.6 * ccache (Unix) @@ -54,7 +54,7 @@ Execute Cmake twice (once for each target compiler (32 and 64 bit)). Set the res ##### Boost setup For Windows: -Build the Boost libs for 32 and 64 bit. Make sure that the platform specific libs are located in ${BOOST_DIR}/lib32-msvc-14 and ${BOOST_DIR}/lib64-msvc-14. +Build the Boost libs for 32 and 64 bit. Make sure that the platform specific libs are located in ${BOOST_DIR}/lib32-msvc-14.0 and ${BOOST_DIR}/lib64-msvc-14.0. For Mac: $ ./bootstrap.sh --with-libraries=filesystem,program_options,system,date_time