Skip to content
Snippets Groups Projects
Commit 3c430be0 authored by Martyn Gigg's avatar Martyn Gigg
Browse files

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.
parent b2a078fe
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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);
}
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment