Skip to content

Ensure Qt5 OpenGL is present for the DeflectQt library #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2019
Merged

Ensure Qt5 OpenGL is present for the DeflectQt library #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMake/common
Open in desktop
Submodule common updated 18 files
+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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
3 changes: 2 additions & 1 deletion deflect/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()