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

BlueBrain · Mar 13, 2019 · 761f7d0 · 761f7d0
1 parent 128e815
commit 761f7d0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
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
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()
+3 −0		CHANGES.md
+1 −1		ChoosePython.cmake
+0 −1		Common.cmake
+8 −3		CommonCUDA.cmake
+9 −0		CommonCheckTargets.cmake
+3 −2		CommonCoverage.cmake
+25 −17		CommonFindPackage.cmake
+1 −2		CommonInstallProject.cmake
+1 −1		Doxyfile
+1 −0		DoxygenRule.cmake
+3 −0		FindLibJpegTurbo.cmake
+153 −28		FindVRPN.cmake
+104 −0		Findquatlib.cmake
+4 −4		GitInfo.cmake
+2 −4		InstallDependencies.cmake
+3 −0		README.md
+1 −0		StringifyShaders.cmake
+1 −1		util/git_pre-commit.in