Examples that use glu functions now properly link to OpenGL::GLU
This commit is contained in:
parent
a44ad273b3
commit
a37a3f3968
@ -34,6 +34,7 @@
|
|||||||
# - OpenGL::GL
|
# - OpenGL::GL
|
||||||
# For OpenGL Will also provide the more explicit targets of:
|
# For OpenGL Will also provide the more explicit targets of:
|
||||||
# - OpenGL::OpenGL
|
# - OpenGL::OpenGL
|
||||||
|
# - OpenGL::GLU
|
||||||
# - OpenGL::GLX
|
# - OpenGL::GLX
|
||||||
# - OpenGL::EGL
|
# - OpenGL::EGL
|
||||||
function(vtkm_find_gl)
|
function(vtkm_find_gl)
|
||||||
@ -59,18 +60,16 @@ function(vtkm_find_gl)
|
|||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
#Find GL
|
#Find GL
|
||||||
if(CMAKE_VERSION VERSION_LESS 3.10)
|
if(DO_GL_FIND AND NOT TARGET OpenGL::GL)
|
||||||
if(DO_GL_FIND AND NOT TARGET OpenGL::GL)
|
if(CMAKE_VERSION VERSION_LESS 3.10)
|
||||||
find_package(OpenGL ${GL_REQUIRED} ${QUIETLY} MODULE)
|
find_package(OpenGL ${GL_REQUIRED} ${QUIETLY} MODULE)
|
||||||
endif()
|
else()
|
||||||
else()
|
#clunky but we need to make sure we use the upstream module if it exists
|
||||||
#clunky but we need to make sure we use the upstream module if it exists
|
set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
|
||||||
set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
|
set(CMAKE_MODULE_PATH "")
|
||||||
set(CMAKE_MODULE_PATH "")
|
|
||||||
if(DO_GL_FIND AND NOT TARGET OpenGL::GL)
|
|
||||||
find_package(OpenGL ${GL_REQUIRED} ${QUIETLY} MODULE)
|
find_package(OpenGL ${GL_REQUIRED} ${QUIETLY} MODULE)
|
||||||
|
set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
|
||||||
endif()
|
endif()
|
||||||
set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#Find GLEW
|
#Find GLEW
|
||||||
@ -106,11 +105,11 @@ if(VTKm_ENABLE_GL_CONTEXT)
|
|||||||
INTERFACE OpenGL::OpenGL OpenGL::GLX GLEW::GLEW)
|
INTERFACE OpenGL::OpenGL OpenGL::GLX GLEW::GLEW)
|
||||||
elseif(TARGET OpenGL::GL)
|
elseif(TARGET OpenGL::GL)
|
||||||
target_link_libraries(vtkm_rendering_gl_context
|
target_link_libraries(vtkm_rendering_gl_context
|
||||||
INTERFACE OpenGL::GL GLEW::GLEW)
|
INTERFACE OpenGL::GL OpenGL::GLU GLEW::GLEW)
|
||||||
endif()
|
endif()
|
||||||
elseif(VTKm_ENABLE_OSMESA_CONTEXT)
|
elseif(VTKm_ENABLE_OSMESA_CONTEXT)
|
||||||
target_link_libraries(vtkm_rendering_gl_context
|
target_link_libraries(vtkm_rendering_gl_context
|
||||||
INTERFACE OpenGL::GL GLEW::GLEW)
|
INTERFACE OpenGL::GL OpenGL::GLU GLEW::GLEW)
|
||||||
elseif(VTKm_ENABLE_EGL_CONTEXT)
|
elseif(VTKm_ENABLE_EGL_CONTEXT)
|
||||||
target_link_libraries(vtkm_rendering_gl_context
|
target_link_libraries(vtkm_rendering_gl_context
|
||||||
INTERFACE OpenGL::OpenGL OpenGL::EGL GLEW::GLEW)
|
INTERFACE OpenGL::OpenGL OpenGL::EGL GLEW::GLEW)
|
||||||
|
@ -30,19 +30,21 @@ if(TARGET OpenGL::GL AND
|
|||||||
TARGET GLUT::GLUT AND
|
TARGET GLUT::GLUT AND
|
||||||
TARGET GLEW::GLEW)
|
TARGET GLEW::GLEW)
|
||||||
|
|
||||||
|
set(gl_libs OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
||||||
|
|
||||||
add_executable(HelloWorld_SERIAL HelloWorld.cxx LoadShaders.h)
|
add_executable(HelloWorld_SERIAL HelloWorld.cxx LoadShaders.h)
|
||||||
target_link_libraries(HelloWorld_SERIAL
|
target_link_libraries(HelloWorld_SERIAL
|
||||||
PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
PRIVATE vtkm_cont ${gl_libs})
|
||||||
|
|
||||||
if(TARGET vtkm::tbb)
|
if(TARGET vtkm::tbb)
|
||||||
add_executable(HelloWorld_TBB HelloWorldTBB.cxx LoadShaders.h)
|
add_executable(HelloWorld_TBB HelloWorldTBB.cxx LoadShaders.h)
|
||||||
target_link_libraries(HelloWorld_TBB
|
target_link_libraries(HelloWorld_TBB
|
||||||
PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
PRIVATE vtkm_cont ${gl_libs})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(TARGET vtkm::cuda)
|
if(TARGET vtkm::cuda)
|
||||||
add_executable(HelloWorld_CUDA HelloWorld.cu LoadShaders.h)
|
add_executable(HelloWorld_CUDA HelloWorld.cu LoadShaders.h)
|
||||||
target_link_libraries(HelloWorld_CUDA
|
target_link_libraries(HelloWorld_CUDA
|
||||||
PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
PRIVATE vtkm_cont ${gl_libs})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
@ -32,17 +32,18 @@ if(TARGET OpenGL::GL AND
|
|||||||
|
|
||||||
set_source_files_properties(quaternion.h PROPERTIES HEADER_FILE_ONLY TRUE)
|
set_source_files_properties(quaternion.h PROPERTIES HEADER_FILE_ONLY TRUE)
|
||||||
|
|
||||||
|
set(gl_libs OpenGL::GL OpenGL::GLU GLEW::GLEW GLUT::GLUT)
|
||||||
add_executable(IsosurfaceUniformGrid_SERIAL IsosurfaceUniformGrid.cxx quaternion.h)
|
add_executable(IsosurfaceUniformGrid_SERIAL IsosurfaceUniformGrid.cxx quaternion.h)
|
||||||
target_link_libraries(IsosurfaceUniformGrid_SERIAL PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(IsosurfaceUniformGrid_SERIAL PRIVATE vtkm_cont ${gl_libs})
|
||||||
|
|
||||||
if(TARGET vtkm::cuda)
|
if(TARGET vtkm::cuda)
|
||||||
add_executable(IsosurfaceUniformGrid_CUDA IsosurfaceUniformGrid.cu quaternion.h)
|
add_executable(IsosurfaceUniformGrid_CUDA IsosurfaceUniformGrid.cu quaternion.h)
|
||||||
target_link_libraries(IsosurfaceUniformGrid_CUDA PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(IsosurfaceUniformGrid_CUDA PRIVATE vtkm_cont ${gl_libs})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(TARGET vtkm::tbb)
|
if(TARGET vtkm::tbb)
|
||||||
add_executable(IsosurfaceUniformGrid_TBB IsosurfaceUniformGridTBB.cxx quaternion.h)
|
add_executable(IsosurfaceUniformGrid_TBB IsosurfaceUniformGridTBB.cxx quaternion.h)
|
||||||
target_link_libraries(IsosurfaceUniformGrid_TBB PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(IsosurfaceUniformGrid_TBB PRIVATE vtkm_cont ${gl_libs})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
@ -30,17 +30,19 @@ if(TARGET OpenGL::GL AND
|
|||||||
TARGET GLUT::GLUT AND
|
TARGET GLUT::GLUT AND
|
||||||
TARGET GLEW::GLEW)
|
TARGET GLEW::GLEW)
|
||||||
|
|
||||||
add_executable(StreamLineUniformGrid_SERIAL StreamLineUniformGrid.cxx)
|
set(gl_libs OpenGL::GL OpenGL::GLU GLEW::GLEW GLUT::GLUT)
|
||||||
target_link_libraries(StreamLineUniformGrid_SERIAL PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
|
||||||
|
add_executable(StreamLineUniformGrid_SERIAL StreamLineUniformGrid.cxx)
|
||||||
|
target_link_libraries(StreamLineUniformGrid_SERIAL PRIVATE vtkm_cont ${gl_libs})
|
||||||
|
|
||||||
if(TARGET vtkm::cont)
|
if(TARGET vtkm::cont)
|
||||||
add_executable(StreamLineUniformGrid_CUDA StreamLineUniformGrid.cu)
|
add_executable(StreamLineUniformGrid_CUDA StreamLineUniformGrid.cu)
|
||||||
target_link_libraries(StreamLineUniformGrid_CUDA PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(StreamLineUniformGrid_CUDA PRIVATE vtkm_cont ${gl_libs})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(TARGET vtkm::tbb)
|
if(TARGET vtkm::tbb)
|
||||||
add_executable(StreamLineUniformGrid_TBB StreamLineUniformGridTBB.cxx)
|
add_executable(StreamLineUniformGrid_TBB StreamLineUniformGridTBB.cxx)
|
||||||
target_link_libraries(StreamLineUniformGrid_TBB PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(StreamLineUniformGrid_TBB PRIVATE vtkm_cont ${gl_libs})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
@ -29,15 +29,18 @@ vtkm_find_gl(OPTIONAL GL GLUT GLEW)
|
|||||||
if(TARGET OpenGL::GL AND
|
if(TARGET OpenGL::GL AND
|
||||||
TARGET GLUT::GLUT AND
|
TARGET GLUT::GLUT AND
|
||||||
TARGET GLEW::GLEW)
|
TARGET GLEW::GLEW)
|
||||||
|
|
||||||
|
set(gl_libs OpenGL::GL OpenGL::GLU GLEW::GLEW GLUT::GLUT)
|
||||||
|
|
||||||
add_executable(TetrahedralizeExplicitGrid_SERIAL TetrahedralizeExplicitGrid.cxx)
|
add_executable(TetrahedralizeExplicitGrid_SERIAL TetrahedralizeExplicitGrid.cxx)
|
||||||
add_executable(TriangulateExplicitGrid_SERIAL TriangulateExplicitGrid.cxx)
|
add_executable(TriangulateExplicitGrid_SERIAL TriangulateExplicitGrid.cxx)
|
||||||
add_executable(TetrahedralizeUniformGrid_SERIAL TetrahedralizeUniformGrid.cxx)
|
add_executable(TetrahedralizeUniformGrid_SERIAL TetrahedralizeUniformGrid.cxx)
|
||||||
add_executable(TriangulateUniformGrid_SERIAL TriangulateUniformGrid.cxx)
|
add_executable(TriangulateUniformGrid_SERIAL TriangulateUniformGrid.cxx)
|
||||||
|
|
||||||
target_link_libraries(TetrahedralizeExplicitGrid_SERIAL PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TetrahedralizeExplicitGrid_SERIAL PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TriangulateExplicitGrid_SERIAL PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TriangulateExplicitGrid_SERIAL PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TetrahedralizeUniformGrid_SERIAL PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TetrahedralizeUniformGrid_SERIAL PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TriangulateUniformGrid_SERIAL PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TriangulateUniformGrid_SERIAL PRIVATE vtkm_cont ${gl_libs})
|
||||||
|
|
||||||
if(TARGET vtkm::cuda)
|
if(TARGET vtkm::cuda)
|
||||||
add_executable(TetrahedralizeExplicitGrid_CUDA TetrahedralizeExplicitGrid.cu)
|
add_executable(TetrahedralizeExplicitGrid_CUDA TetrahedralizeExplicitGrid.cu)
|
||||||
@ -45,10 +48,10 @@ if(TARGET OpenGL::GL AND
|
|||||||
add_executable(TetrahedralizeUniformGrid_CUDA TetrahedralizeUniformGrid.cu)
|
add_executable(TetrahedralizeUniformGrid_CUDA TetrahedralizeUniformGrid.cu)
|
||||||
add_executable(TriangulateUniformGrid_CUDA TriangulateUniformGrid.cu)
|
add_executable(TriangulateUniformGrid_CUDA TriangulateUniformGrid.cu)
|
||||||
|
|
||||||
target_link_libraries(TetrahedralizeExplicitGrid_CUDA PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TetrahedralizeExplicitGrid_CUDA PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TriangulateExplicitGrid_CUDA PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TriangulateExplicitGrid_CUDA PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TetrahedralizeUniformGrid_CUDA PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TetrahedralizeUniformGrid_CUDA PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TriangulateUniformGrid_CUDA PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TriangulateUniformGrid_CUDA PRIVATE vtkm_cont ${gl_libs})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(TARGET vtkm::tbb)
|
if(TARGET vtkm::tbb)
|
||||||
@ -57,9 +60,9 @@ if(TARGET OpenGL::GL AND
|
|||||||
add_executable(TetrahedralizeUniformGrid_TBB TetrahedralizeUniformGridTBB.cxx)
|
add_executable(TetrahedralizeUniformGrid_TBB TetrahedralizeUniformGridTBB.cxx)
|
||||||
add_executable(TriangulateUniformGrid_TBB TriangulateUniformGridTBB.cxx)
|
add_executable(TriangulateUniformGrid_TBB TriangulateUniformGridTBB.cxx)
|
||||||
|
|
||||||
target_link_libraries(TetrahedralizeExplicitGrid_TBB PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TetrahedralizeExplicitGrid_TBB PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TriangulateExplicitGrid_TBB PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TriangulateExplicitGrid_TBB PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TetrahedralizeUniformGrid_TBB PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TetrahedralizeUniformGrid_TBB PRIVATE vtkm_cont ${gl_libs})
|
||||||
target_link_libraries(TriangulateUniformGrid_TBB PRIVATE vtkm_cont OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
target_link_libraries(TriangulateUniformGrid_TBB PRIVATE vtkm_cont ${gl_libs})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user