Remove glu + make Qt5 quiet + look for OpenGL

This commit is contained in:
Clement Jamin 2015-11-30 11:10:35 +01:00
parent 46d485f3ea
commit fada28edb8
1 changed files with 3 additions and 3 deletions

View File

@ -17,13 +17,13 @@ find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} )
# Find Qt5 itself
find_package(Qt5 COMPONENTS OpenGL)
find_package(Qt5 QUIET COMPONENTS OpenGL)
if(Qt5_FOUND)
add_definitions(-DQT_NO_KEYWORDS)
endif(Qt5_FOUND)
# Find OpenGL
#find_package(OpenGL)
find_package(OpenGL)
# Find CImg
find_path(CIMG_INCLUDE_DIR
@ -89,7 +89,7 @@ if(CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND)
target_link_libraries( Reconstruction_simplification_2_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
# Link with OpenGL
target_link_libraries( Reconstruction_simplification_2_demo ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
target_link_libraries( Reconstruction_simplification_2_demo ${OPENGL_gl_LIBRARY} )
# Link with CImg dependencies
if( NOT WIN32 )