diff --git a/CMakeLists.txt b/CMakeLists.txt index dbb47ab1605e91fc4f0e59c175d669aef0616190..e6235e861f373acb6f7b2f8456fbf663df73b702 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 687cf67b19895119c8c526045bcd983a4b35e8be..9b50e6c965be407ad3ae0582df3eb5b1c6928388 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 8d9c82f7daff0deac3148d1ab4b8dcc41548fb81..d374042a93a42193f493d5f97405e3f321eea736 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