ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: update to boost 1.68 for Windows builds

Browse Source
This commit is contained in:
mlangkabel
2018-09-10 17:12:42 +02:00
parent db85279b8c
commit ec0f3bb2ac
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -3
View File
@@ -131,14 +131,14 @@ else()
STRING(REGEX REPLACE "\\\\" "/" BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR}) STRING(REGEX REPLACE "\\\\" "/" BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR})
if(${WINXXBITS} STREQUAL "Win32") if(${WINXXBITS} STREQUAL "Win32")
set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib32-msvc-14") set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib32-msvc-14.0")
else() else()
set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib64-msvc-14") set(BOOST_LIBRARYDIR "${BOOST_LIBRARYDIR}/lib64-msvc-14.0")
endif() endif()
set(Boost_NO_SYSTEM_PATHS ON) set(Boost_NO_SYSTEM_PATHS ON)
endif() 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 ------------------------------------------------------------------------ # Botan ------------------------------------------------------------------------
README.md
+2 -2
View File
@@ -8,7 +8,7 @@
* QT 5.10.1 * QT 5.10.1
* CxxTest 4.3 * 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) * 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 * Botan 2.1.0
* Image Magick 7.0.6 * Image Magick 7.0.6
* ccache (Unix) * ccache (Unix)
@@ -54,7 +54,7 @@ Execute Cmake twice (once for each target compiler (32 and 64 bit)). Set the res
##### Boost setup ##### Boost setup
For Windows: 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: For Mac:
$ ./bootstrap.sh --with-libraries=filesystem,program_options,system,date_time $ ./bootstrap.sh --with-libraries=filesystem,program_options,system,date_time