From 2da47cfacde853095c38ae1f1b6479d292d6c57b Mon Sep 17 00:00:00 2001
From: Simon Heybrock <simon.heybrock@esss.se>
Date: Fri, 17 Jun 2016 11:16:09 +0200
Subject: [PATCH] Re #16282. Removed lib-dependency of Histogram on Kernel.
Dependency is header-only (cow_ptr), so now changes in Kernel do not
trigger a rebuild (or re-linking) libMantidHistogramData.so.
---
Framework/CMakeLists.txt | 4 +++-
Framework/HistogramData/test/CMakeLists.txt | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
index 4e35f1b7697..594e0bb4406 100644
--- a/Framework/CMakeLists.txt
+++ b/Framework/CMakeLists.txt
@@ -68,11 +68,13 @@ add_dependencies ( check FrameworkTests )
include_directories (Kernel/inc)
add_subdirectory (Kernel)
-set ( MANTIDLIBS ${MANTIDLIBS} Kernel )
include_directories (HistogramData/inc)
add_subdirectory (HistogramData)
+
+# HistogramData has header-only dependency on Kernel, so Kernel comes after.
set ( MANTIDLIBS ${MANTIDLIBS} HistogramData )
+set ( MANTIDLIBS ${MANTIDLIBS} Kernel )
include_directories (Geometry/inc)
# muParser needed by Geometry and subsequent packages
diff --git a/Framework/HistogramData/test/CMakeLists.txt b/Framework/HistogramData/test/CMakeLists.txt
index bec96c9d849..63fa7501775 100644
--- a/Framework/HistogramData/test/CMakeLists.txt
+++ b/Framework/HistogramData/test/CMakeLists.txt
@@ -4,7 +4,6 @@ if ( CXXTEST_FOUND )
cxxtest_add_test ( HistogramDataTest ${TEST_FILES} ${GMOCK_TEST_FILES})
target_link_libraries( HistogramDataTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
HistogramData
- Kernel
${Boost_LIBRARIES}
${GTEST_LIBRARIES} )
--
GitLab