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
130ba5ca
Commit
130ba5ca
authored
10 years ago
by
Hahn, Steven
Browse files
Options
Downloads
Patches
Plain Diff
Refs #11400. use include_directories to include paraview headers.
parent
00badb07
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Vates/VatesSimpleGui/StandAloneExec/CMakeLists.txt
+4
-3
4 additions, 3 deletions
...Mantid/Vates/VatesSimpleGui/StandAloneExec/CMakeLists.txt
Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+6
-4
6 additions, 4 deletions
Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
with
10 additions
and
7 deletions
Code/Mantid/Vates/VatesSimpleGui/StandAloneExec/CMakeLists.txt
+
4
−
3
View file @
130ba5ca
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+
6
−
4
View file @
130ba5ca
...
...
@@ -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
...
...
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