Skip to content
Snippets Groups Projects
Commit 91c81ca2 authored by Hahn, Steven's avatar Hahn, Steven Committed by GitHub
Browse files

Merge pull request #19477 from mantidproject/boost_serialization

Require and package boost-serialization.
parents eb854885 e6ee4365
No related merge requests found
......@@ -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),"
......
......@@ -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",
......
......@@ -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 )
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment