Merge topic 'reandering-contexts-in-external-project'

96ff3a53 Find OpenGL libraries in external projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1161
This commit is contained in:
Robert Maynard 2018-04-20 18:35:14 +00:00 committed by Kitware Robot
commit e9c5088506

@ -84,11 +84,6 @@ function(vtkm_find_gl)
endfunction()
#-----------------------------------------------------------------------------
if(TARGET vtkm_rendering_gl_context)
return()
endif()
add_library(vtkm_rendering_gl_context INTERFACE)
if(VTKm_ENABLE_GL_CONTEXT OR
VTKm_ENABLE_OSMESA_CONTEXT OR
VTKm_ENABLE_EGL_CONTEXT
@ -98,6 +93,13 @@ if(VTKm_ENABLE_GL_CONTEXT OR
QUIET)
endif()
#-----------------------------------------------------------------------------
if(TARGET vtkm_rendering_gl_context)
return()
endif()
add_library(vtkm_rendering_gl_context INTERFACE)
#-----------------------------------------------------------------------------
if(VTKm_ENABLE_GL_CONTEXT)
if(TARGET OpenGL::GLX)