diff --git a/CMakeLists.txt b/CMakeLists.txt index 489aad76d6120783e8407c54182c860ab4639e1e..56bdc107cc6be20d4cd406196f5040a70705456e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,6 +300,7 @@ if ( ENABLE_CPACK ) set ( DEPENDS_LIST "libboost-date-time${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}," "libboost-regex${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}," "libboost-python${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}," + "libboost-serialization${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}," "libnexus0 (>= 4.3)," "libgsl0ldbl," "libqtcore4 (>= 4.2)," diff --git a/MantidPlot/make_package.rb.in b/MantidPlot/make_package.rb.in index e32fbd98f748e65ae22598a709ded4853d9bb6e5..5827b8fb848a8aebed7255f3ac202dc63bee3c8d 100755 --- a/MantidPlot/make_package.rb.in +++ b/MantidPlot/make_package.rb.in @@ -42,6 +42,7 @@ ParaView_dir = Pathname.new("@ParaView_DIR@") library_filenames = ["libboost_regex-mt.dylib", "libboost_date_time-mt.dylib", "libboost_python-mt.dylib", + "libboost_serialization-mt.dylib", "libgsl.dylib", "libgslcblas.dylib", "libjsoncpp.dylib", diff --git a/buildconfig/CMake/Bootstrap.cmake b/buildconfig/CMake/Bootstrap.cmake index 30e32423430f47b99f533210ac12ce7b905bc733..fff16446c33898be8840553e40b8b5a23d599884 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/CommonSetup.cmake b/buildconfig/CMake/CommonSetup.cmake index d374042a93a42193f493d5f97405e3f321eea736..8d9c82f7daff0deac3148d1ab4b8dcc41548fb81 100644 --- a/buildconfig/CMake/CommonSetup.cmake +++ b/buildconfig/CMake/CommonSetup.cmake @@ -40,7 +40,7 @@ set ( TESTING_TIMEOUT 300 CACHE INTEGER ########################################################################### set ( Boost_NO_BOOST_CMAKE TRUE ) -find_package ( Boost 1.53.0 REQUIRED date_time regex ) +find_package ( Boost 1.53.0 REQUIRED date_time regex serialization ) include_directories( SYSTEM ${Boost_INCLUDE_DIRS} ) add_definitions ( -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB ) # Need this defined globally for our log time values diff --git a/buildconfig/CMake/WindowsNSIS.cmake b/buildconfig/CMake/WindowsNSIS.cmake index 64c725a4f7ab477f8301963ffff8cbe8b7137dce..4f50ebc3be4800482b3d094a929fcd4e5e822f76 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