Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 19:15:45 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'incorrect-configure-in-rendering' into 'master'

Browse Source 
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).

See merge request !519
This commit is contained in:
Kenneth Moreland 2016-08-25 18:20:56 -04:00
commit b568dcee62
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/VTKmConfigureComponents.cmake
View File

@ -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})

23
vtkm/rendering/CMakeLists.txt
View File

@ -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()