From e6ee4365ac32ecc9546558ff239349dce6d5b842 Mon Sep 17 00:00:00 2001 From: Simon Heybrock <simon.heybrock@esss.se> Date: Thu, 4 May 2017 14:56:26 +0200 Subject: [PATCH] Re #0. Update for getting boost-serialization on Windows. --- buildconfig/CMake/Bootstrap.cmake | 2 +- buildconfig/CMake/WindowsNSIS.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildconfig/CMake/Bootstrap.cmake b/buildconfig/CMake/Bootstrap.cmake index 30e32423430..fff16446c33 100644 --- a/buildconfig/CMake/Bootstrap.cmake +++ b/buildconfig/CMake/Bootstrap.cmake @@ -10,7 +10,7 @@ if( MSVC ) include ( ExternalProject ) set( EXTERNAL_ROOT ${PROJECT_SOURCE_DIR}/external ) set( THIRD_PARTY_GIT_URL "https://github.com/mantidproject/thirdparty-msvc2015.git" ) - set ( THIRD_PARTY_GIT_SHA1 87a8fa24f066725494454c4ff10bcc21088b316a ) + set ( THIRD_PARTY_GIT_SHA1 00a89211af3e581e99a42a2686bb94ead3b45463 ) set ( THIRD_PARTY_DIR ${EXTERNAL_ROOT}/src/ThirdParty ) # Generates a script to do the clone/update in tmp set ( _project_name ThirdParty ) diff --git a/buildconfig/CMake/WindowsNSIS.cmake b/buildconfig/CMake/WindowsNSIS.cmake index 64c725a4f7a..4f50ebc3be4 100644 --- a/buildconfig/CMake/WindowsNSIS.cmake +++ b/buildconfig/CMake/WindowsNSIS.cmake @@ -45,6 +45,7 @@ set ( BOOST_DIST_DLLS boost_date_time-mt.dll boost_python-mt.dll boost_regex-mt.dll + boost_serialization-mt.dll ) set ( POCO_DIST_DLLS PocoCrypto64.dll -- GitLab