This commit is contained in:
@@ -516,14 +516,20 @@ if (WITH_QT)
|
|||||||
find_package(Qt4)
|
find_package(Qt4)
|
||||||
if (QT4_FOUND)
|
if (QT4_FOUND)
|
||||||
set(HAVE_QT 1)
|
set(HAVE_QT 1)
|
||||||
|
find_package (OpenGL QUIET)
|
||||||
|
#Qt 4.6 is the minimum for OpenGL
|
||||||
|
if (QT_QTOPENGL_FOUND AND OPENGL_FOUND AND QT_VERSION_MINOR GREATER 5)
|
||||||
|
set(HAVE_QT_OPENGL 1)
|
||||||
|
add_definitions(-DHAVE_QT_OPENGL)
|
||||||
|
endif()
|
||||||
#add_definitions(-DHAVE_QT)
|
#add_definitions(-DHAVE_QT)
|
||||||
set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS "HAVE_QT")
|
set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS "HAVE_QT")
|
||||||
|
|
||||||
#find_package (OpenGL QUIET)
|
find_package (OpenGL QUIET)
|
||||||
#if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
|
if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
|
||||||
# set(HAVE_QT_OPENGL 1)
|
set(HAVE_QT_OPENGL 1)
|
||||||
# add_definitions(-DHAVE_QT_OPENGL)
|
add_definitions(-DHAVE_QT_OPENGL)
|
||||||
#endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user