From a7e04398a2ee4d2e0939e9f89328d401e546f9c8 Mon Sep 17 00:00:00 2001
From: Simon Heybrock <simon.heybrock@esss.se>
Date: Tue, 28 Mar 2017 14:01:37 +0200
Subject: [PATCH] Re #19205. Remove dependency on boost serialization in
non-MPI builds.
---
CMakeLists.txt | 1 -
Framework/Parallel/CMakeLists.txt | 2 +-
buildconfig/CMake/CommonSetup.cmake | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbb47ab1605..e6235e861f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,7 +299,6 @@ if ( ENABLE_CPACK )
# common packages
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-serialization${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION},"
"libboost-python${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION},"
"libnexus0 (>= 4.3),"
"libgsl0ldbl,"
diff --git a/Framework/Parallel/CMakeLists.txt b/Framework/Parallel/CMakeLists.txt
index 687cf67b198..9b50e6c965b 100644
--- a/Framework/Parallel/CMakeLists.txt
+++ b/Framework/Parallel/CMakeLists.txt
@@ -53,7 +53,7 @@ endif ()
# Add to the 'Framework' group in VS
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} )
# Add the unit tests directory
diff --git a/buildconfig/CMake/CommonSetup.cmake b/buildconfig/CMake/CommonSetup.cmake
index 8d9c82f7daf..d374042a93a 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 serialization )
+find_package ( Boost 1.53.0 REQUIRED date_time regex )
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
--
GitLab