From 7f8ea09f887cc88573c980c61f4d029ddc471190 Mon Sep 17 00:00:00 2001
From: Kenneth Moreland <kmorel@sandia.gov>
Date: Thu, 25 Aug 2016 09:44:34 -0600
Subject: [PATCH] Fix configuration of dependent rendering libraries

The VTKmConfigureComponents.cmake file has lots of careful configuration
of many of VTK-m components and dependent libraries (like OpenGL,
OSMesa, etc.) that takes care of several corner cases. The configuration
is consolidated here so that it can be consistent across the many
directories in VTK-m as well as other projects that use VTK-m.

Recent changes to the configuration in rendering circumvented these and
directly tried to configure dependent rendering libraries. This is wrong
(and more importantly broke my OSX build).
---
 CMake/VTKmConfigureComponents.cmake |  2 +-
 vtkm/rendering/CMakeLists.txt       | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CMake/VTKmConfigureComponents.cmake b/CMake/VTKmConfigureComponents.cmake
index 66d477529..0fcde7344 100644
--- a/CMake/VTKmConfigureComponents.cmake
+++ b/CMake/VTKmConfigureComponents.cmake
@@ -117,7 +117,7 @@ macro(vtkm_configure_component_OpenGL)
 endmacro(vtkm_configure_component_OpenGL)
 
 macro(vtkm_configure_component_OSMesa)
-  vtkm_configure_component_Base()
+  vtkm_configure_component_OpenGL()
 
   if (UNIX AND NOT APPLE)
     find_package(MESA ${VTKm_FIND_PACKAGE_QUIETLY})
diff --git a/vtkm/rendering/CMakeLists.txt b/vtkm/rendering/CMakeLists.txt
index 6ba30b2be..1ee467148 100644
--- a/vtkm/rendering/CMakeLists.txt
+++ b/vtkm/rendering/CMakeLists.txt
@@ -58,21 +58,22 @@ set(osmesa_headers
   )
 
 #-----------------------------------------------------------------------------
-find_package(MESA ${VTKm_FIND_PACKAGE_QUIETLY})
-if(OSMESA_FOUND)
-set(headers ${headers} ${osmesa_headers})
-endif()
-
-find_package(OpenGL ${VTKm_FIND_PACKAGE_QUIETLY})
-if(OPENGL_FOUND)
+vtkm_configure_component_OpenGL()
+if(VTKm_OpenGL_FOUND)
   set(headers ${headers} ${opengl_headers})
   
-  find_package(EGL ${VTKm_FIND_PACKAGE_QUIETLY})
-  if(EGL_FOUND)
+  vtkm_configure_component_OSMesa()
+  if(VTKm_OSMesa_FOUND)
+    set(headers ${headers} ${osmesa_headers})
+  endif()
+
+  vtkm_configure_component_EGL()
+  if(VTKm_EGL_FOUND)
     set(headers ${headers} ${egl_headers})
   endif()
-  find_package(GLFW ${VTKm_FIND_PACKAGE_QUIETLY})
-  if(GLFW_FOUND)
+
+  vtkm_configure_component_GLFW()
+  if(VTKm_GLFW_FOUND)
     set(headers ${headers} ${glfw_headers})
   endif()
 endif()