mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-21 19:45:44 +00:00
Merge topic 'build_rendering_without_mesa'
1d379db4 Allow people to build rendering without mesa. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !438
This commit is contained in:
commit
c792dd505c
@ -59,6 +59,7 @@ set(osmesa_headers
|
||||
)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
set(includes)
|
||||
if(OPENGL_FOUND)
|
||||
set(headers ${headers} ${opengl_headers})
|
||||
|
||||
@ -69,6 +70,7 @@ if(OPENGL_FOUND)
|
||||
find_package(MESA)
|
||||
if (OSMESA_FOUND)
|
||||
set(headers ${headers} ${glx_headers})
|
||||
list(APPEND includes ${OSMESA_INCLUDE_DIR})
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
@ -78,7 +80,8 @@ vtkm_declare_headers(${headers})
|
||||
add_subdirectory(internal)
|
||||
add_subdirectory(raytracing)
|
||||
|
||||
include_directories(${OSMESA_INCLUDE_DIR})
|
||||
include_directories(${includes})
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -23,11 +23,13 @@ set(unit_tests
|
||||
UnitTestMapperVolume.cxx
|
||||
)
|
||||
|
||||
set(libs)
|
||||
if (OSMESA_FOUND)
|
||||
set(unit_tests ${unit_tests}
|
||||
UnitTestMapperOSMesa.cxx
|
||||
)
|
||||
list(APPEND libs ${OSMESA_INCLUDE_DIR})
|
||||
endif()
|
||||
|
||||
VTKM_unit_tests(SOURCES ${unit_tests}
|
||||
LIBRARIES ${OSMESA_LIBRARY})
|
||||
LIBRARIES ${libs})
|
||||
|
Loading…
Reference in New Issue
Block a user