Commit 720dc149 authored by Robert Maynard's avatar Robert Maynard

properly link vtkm::interop to pthread.

parent 2406f45c
......@@ -155,7 +155,7 @@ macro(vtkm_configure_component_Interop)
)
#on unix/linux Glew uses pthreads, so we need to find that, and link to it
#explicitly or else in release mode we get sigsegv on launch
if (VTKm_Interop_FOUND AND UNIX)
if (VTKm_ENABLE_OPENGL_INTEROP AND UNIX)
find_package(Threads ${VTKm_FIND_PACKAGE_QUIETLY})
set(vtkm_interop_dependent_vars ${vtkm_interop_dependent_vars} CMAKE_USE_PTHREADS_INIT)
endif()
......@@ -163,7 +163,7 @@ macro(vtkm_configure_component_Interop)
vtkm_finish_configure_component(Interop
DEPENDENT_VARIABLES ${vtkm_interop_dependent_vars}
ADD_INCLUDES ${GLEW_INCLUDE_DIRS}
ADD_LIBRARIES ${GLEW_LIBRARIES}
ADD_LIBRARIES ${GLEW_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
)
endmacro(vtkm_configure_component_Interop)
......
......@@ -30,9 +30,6 @@ set(unit_tests
# Need glut for these tests
if(GLUT_FOUND)
set(VTKm_INCLUDE_DIRS ${VTKm_INCLUDE_DIRS} ${GLUT_INCLUDE_DIR})
set(VTKM_LIBRARIES ${VTKm_LIBRARIES} ${GLUT_LIBRARIES})
vtkm_declare_headers(${headers})
vtkm_unit_tests(SOURCES ${unit_tests})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment