Merge branch 'osmesa-link-error' into 'master'

Fix minor issues with building with OSMesa See merge request !440

Merge branch 'osmesa-link-error' into 'master'
Fix minor issues with building with OSMesa See merge request !440
30fdc7f9 · Kenneth Moreland · 5ba6afe6 · 74f93807 · 30fdc7f9
Commit 30fdc7f9 authored Jun 06, 2016 by Kenneth Moreland
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

vtkm/rendering/testing/CMakeLists.txt vtkm/rendering/testing/CMakeLists.txt +9 -5

No files found.
--- a/vtkm/rendering/testing/CMakeLists.txt
+++ b/vtkm/rendering/testing/CMakeLists.txt
@@ -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}