From d8c908b2ad819f280aa18974542bddd7063f3d66 Mon Sep 17 00:00:00 2001 From: Pawel Jozef Podhajski Date: Wed, 12 Jun 2019 09:38:15 +0200 Subject: [PATCH] qt5opengl cmakelists bug + CMake/common bump --- CMake/common | 2 +- deflect/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/common b/CMake/common index 89c330d..8b69d72 160000 --- a/CMake/common +++ b/CMake/common @@ -1 +1 @@ -Subproject commit 89c330d50b978276dcea3af700258e554be8dfd7 +Subproject commit 8b69d72180aef3de93d9692781026d7069a9d8d8 diff --git a/deflect/CMakeLists.txt b/deflect/CMakeLists.txt index 3336cca..0931dca 100644 --- a/deflect/CMakeLists.txt +++ b/deflect/CMakeLists.txt @@ -62,7 +62,7 @@ common_library(Deflect) add_subdirectory(server) -if(Qt5Qml_FOUND AND Qt5Quick_FOUND AND QtOpenGL_FOUND AND +if(Qt5Qml_FOUND AND Qt5Quick_FOUND AND Qt5OpenGL_FOUND AND NOT Qt5Quick_VERSION VERSION_LESS 5.4) add_subdirectory(qt) endif()