Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Steven Walton
VTK-m
Commits
30fdc7f9
Commit
30fdc7f9
authored
Jun 06, 2016
by
Kenneth Moreland
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'osmesa-link-error' into 'master'
Fix minor issues with building with OSMesa See merge request !440
parents
5ba6afe6
74f93807
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
vtkm/rendering/testing/CMakeLists.txt
vtkm/rendering/testing/CMakeLists.txt
+9
-5
No files found.
vtkm/rendering/testing/CMakeLists.txt
View file @
30fdc7f9
...
...
@@ -24,11 +24,15 @@ set(unit_tests
)
set
(
libs
)
if
(
OSMESA_FOUND
)
set
(
unit_tests
${
unit_tests
}
UnitTestMapperOSMesa.cxx
)
list
(
APPEND libs
${
OSMESA_INCLUDE_DIR
}
)
if
(
OPENGL_FOUND
)
list
(
APPEND libs
${
OPENGL_LIBRARIES
}
)
if
(
OSMESA_FOUND
)
set
(
unit_tests
${
unit_tests
}
UnitTestMapperOSMesa.cxx
)
list
(
APPEND libs
${
OSMESA_LIBRARY
}
)
endif
()
endif
()
VTKM_unit_tests
(
SOURCES
${
unit_tests
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment