Skip to content
Snippets Groups Projects
Commit a7e04398 authored by Simon Heybrock's avatar Simon Heybrock
Browse files

Re #19205. Remove dependency on boost serialization in non-MPI builds.

parent 6b3c004a
No related branches found
No related tags found
No related merge requests found
...@@ -299,7 +299,6 @@ if ( ENABLE_CPACK ) ...@@ -299,7 +299,6 @@ if ( ENABLE_CPACK )
# common packages # common packages
set ( DEPENDS_LIST "libboost-date-time${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}," 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-regex${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION},"
"libboost-serialization${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION},"
"libboost-python${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}," "libboost-python${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION},"
"libnexus0 (>= 4.3)," "libnexus0 (>= 4.3),"
"libgsl0ldbl," "libgsl0ldbl,"
......
...@@ -53,7 +53,7 @@ endif () ...@@ -53,7 +53,7 @@ endif ()
# Add to the 'Framework' group in VS # Add to the 'Framework' group in VS
set_property ( TARGET Parallel PROPERTY FOLDER "MantidFramework" ) set_property ( TARGET Parallel PROPERTY FOLDER "MantidFramework" )
target_link_libraries ( Parallel LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME} target_link_libraries ( Parallel LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
${GSL_LIBRARIES} ${MANTIDLIBS} ) ${GSL_LIBRARIES} ${MANTIDLIBS} )
# Add the unit tests directory # Add the unit tests directory
......
...@@ -40,7 +40,7 @@ set ( TESTING_TIMEOUT 300 CACHE INTEGER ...@@ -40,7 +40,7 @@ set ( TESTING_TIMEOUT 300 CACHE INTEGER
########################################################################### ###########################################################################
set ( Boost_NO_BOOST_CMAKE TRUE ) set ( Boost_NO_BOOST_CMAKE TRUE )
find_package ( Boost 1.53.0 REQUIRED date_time regex serialization ) find_package ( Boost 1.53.0 REQUIRED date_time regex )
include_directories( SYSTEM ${Boost_INCLUDE_DIRS} ) include_directories( SYSTEM ${Boost_INCLUDE_DIRS} )
add_definitions ( -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB ) add_definitions ( -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB )
# Need this defined globally for our log time values # Need this defined globally for our log time values
......
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