From 3c430be0eea8c6aaa2eeff78a8617c373d4388b2 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@gmail.com>
Date: Thu, 27 Sep 2018 09:35:18 +0100
Subject: [PATCH] Fix MplCpp test build for MSVC
The boost includes are not in a system location.
MSVC seems to generate an ambiguity when using
boost::python::object() directly in a constructor.
---
qt/widgets/mplcpp/CMakeLists.txt | 1 +
qt/widgets/mplcpp/test/ArtistTest.h | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/qt/widgets/mplcpp/CMakeLists.txt b/qt/widgets/mplcpp/CMakeLists.txt
index fb3178b299e..97284a2caf1 100644
--- a/qt/widgets/mplcpp/CMakeLists.txt
+++ b/qt/widgets/mplcpp/CMakeLists.txt
@@ -37,6 +37,7 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsMplCpp
INCLUDE_DIRS
inc
../../../Framework/PythonInterface/core/inc
+ ${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH}
${PYTHON_NUMPY_INCLUDE_DIR}
LINK_LIBS
diff --git a/qt/widgets/mplcpp/test/ArtistTest.h b/qt/widgets/mplcpp/test/ArtistTest.h
index e0c48020ba3..f2a6f4a60ca 100644
--- a/qt/widgets/mplcpp/test/ArtistTest.h
+++ b/qt/widgets/mplcpp/test/ArtistTest.h
@@ -29,7 +29,8 @@ public:
// ----------------- failure tests ---------------------
void testConstructWithNonArtistThrowsInvalidArgument() {
- TS_ASSERT_THROWS(Artist(Python::Object()), std::invalid_argument);
+ Python::Object none;
+ TS_ASSERT_THROWS(Artist artist(none), std::invalid_argument);
}
};
--
GitLab