mirror of https://github.com/CGAL/cgal
Merge pull request #811 from afabri/Surface_mesher-OpenGL-GF
Test for OPENGL_FOUND
This commit is contained in:
commit
42f7221e99
|
|
@ -45,7 +45,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
|
|||
find_package(QGLViewer )
|
||||
find_package(OpenGL )
|
||||
|
||||
if ( QGLVIEWER_FOUND AND Qt5_FOUND)
|
||||
if ( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )
|
||||
|
||||
|
||||
include_directories( ${QGLVIEWER_INCLUDE_DIR} )
|
||||
|
|
@ -116,9 +116,9 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
|
|||
|
||||
target_link_libraries( ${prj} ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${VTK_LIBS})
|
||||
|
||||
else( QGLVIEWER_FOUND AND Qt5_FOUND)
|
||||
else( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )
|
||||
message(STATUS "NOTICE: This demo needs libQGLViewer, and will not be compiled.")
|
||||
endif( QGLVIEWER_FOUND AND Qt5_FOUND)
|
||||
endif( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )
|
||||
else(CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
|
||||
if(RUNNING_CGAL_AUTO_TEST)
|
||||
# Just to avoid a warning from CMake if that variable is set on the command line...
|
||||
|
|
|
|||
Loading…
Reference in New Issue