Ensure Qt5 OpenGL is present for the DeflectQt library (#210)

Juan Hernando · web-flow · commit 761f7d0b2a9b · 2019-03-13T15:25:57.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -38,6 +38,7 @@ addons:
       - libturbojpeg
       - qtbase5-dev
       - qtdeclarative5-dev
+      - libqt5opengl5-dev
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated cmake || brew upgrade cmake; fi
diff --git a/CMake/common b/CMake/common
@@ -1 +1 @@
-Subproject commit 28f4d72999dddac3404a1b040f8c5ed649d3accd
+Subproject commit 89c330d50b978276dcea3af700258e554be8dfd7
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,6 +47,7 @@ endif()
 common_find_package(Qt5Network REQUIRED)
 common_find_package(Qt5Qml)
 common_find_package(Qt5Quick)
+common_find_package(Qt5OpenGL)
 common_find_package(Qt5Widgets REQUIRED)
 common_find_package_post()
 
diff --git a/deflect/CMakeLists.txt b/deflect/CMakeLists.txt
@@ -62,6 +62,7 @@ common_library(Deflect)
 
 add_subdirectory(server)
 
-if(Qt5Qml_FOUND AND Qt5Quick_FOUND AND NOT Qt5Quick_VERSION VERSION_LESS 5.4)
+if(Qt5Qml_FOUND AND Qt5Quick_FOUND AND QtOpenGL_FOUND AND
+   NOT Qt5Quick_VERSION VERSION_LESS 5.4)
   add_subdirectory(qt)
 endif()
