From 130ba5ca77cfa6610a0d0c75decd9a4f7fb4108b Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Thu, 19 Mar 2015 13:10:44 -0700
Subject: [PATCH] Refs #11400. use include_directories to include paraview
headers.
---
.../Vates/VatesSimpleGui/StandAloneExec/CMakeLists.txt | 7 ++++---
.../Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt | 10 ++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Code/Mantid/Vates/VatesSimpleGui/StandAloneExec/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/StandAloneExec/CMakeLists.txt
index 0ccd2ead71b..bcb80bf44f1 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/StandAloneExec/CMakeLists.txt
+++ b/Code/Mantid/Vates/VatesSimpleGui/StandAloneExec/CMakeLists.txt
@@ -38,13 +38,14 @@ set( TEST_SUITES
add_executable( ${PROJECT_NAME} ${INCLUDE_FILES} ${SOURCE_FILES} ${MOC_SRCS} )
+include_directories( SYSTEM ${PARAVIEW_INCLUDE_DIRS} )
+
target_link_libraries( ${PROJECT_NAME}
-VatesSimpleGuiQtWidgets
-VatesSimpleGuiViewWidgets
-SYSTEM
pqCore pqComponents pqApplicationComponents
${QT_LIBRARIES}
${MANTID_SUBPROJECT_LIBS}
+VatesSimpleGuiQtWidgets
+VatesSimpleGuiViewWidgets
)
if( SQUISH_FOUND )
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
index 6d64ce35f82..98fb3b2fe58 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -122,7 +122,13 @@ set_target_properties( VatesSimpleGuiViewWidgets PROPERTIES OUTPUT_NAME MantidVa
# Add to the 'VatesSimpleGui' group in VS
set_property( TARGET VatesSimpleGuiViewWidgets PROPERTY FOLDER MantidVatesSimpleGui )
+
+include_directories( SYSTEM ${PARAVIEW_INCLUDE_DIRS} )
+
target_link_libraries( VatesSimpleGuiViewWidgets
+pqApplicationComponents
+pqComponents
+${QT_LIBRARIES}
VatesSimpleGuiQtWidgets
MantidQtAPI
VatesAPI
@@ -130,10 +136,6 @@ ${MANTID_SUBPROJECT_LIBS}
MantidQtSliceViewer
MantidQtFactory
MantidWidgets
-SYSTEM
-pqApplicationComponents
-pqComponents
-${QT_LIBRARIES}
)
# Create test file projects
--
GitLab