Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
a7e04398
Commit
a7e04398
authored
8 years ago
by
Simon Heybrock
Browse files
Options
Downloads
Patches
Plain Diff
Re #19205. Remove dependency on boost serialization in non-MPI builds.
parent
6b3c004a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+0
-1
0 additions, 1 deletion
CMakeLists.txt
Framework/Parallel/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Framework/Parallel/CMakeLists.txt
buildconfig/CMake/CommonSetup.cmake
+1
-1
1 addition, 1 deletion
buildconfig/CMake/CommonSetup.cmake
with
2 additions
and
3 deletions
CMakeLists.txt
+
0
−
1
View file @
a7e04398
...
@@ -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,"
...
...
This diff is collapsed.
Click to expand it.
Framework/Parallel/CMakeLists.txt
+
1
−
1
View file @
a7e04398
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
buildconfig/CMake/CommonSetup.cmake
+
1
−
1
View file @
a7e04398
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment