Commit 69631474 authored by Martin Schultz's avatar Martin Schultz

fixed bug in cmake that prevented proper detection of qt < 5.6

parent da097bd9
Pipeline #1806 passed with stage
...@@ -295,7 +295,7 @@ macro (acg_qt5) ...@@ -295,7 +295,7 @@ macro (acg_qt5)
find_package (Qt5Concurrent QUIET) find_package (Qt5Concurrent QUIET)
find_package (Qt5PrintSupport QUIET) find_package (Qt5PrintSupport QUIET)
find_package (Qt5Svg QUIET) find_package (Qt5Svg QUIET)
elseif(${QT_VERSION_MINOR} GREATER 5) else(${QT_VERSION_MINOR} GREATER 5)
find_package (Qt5Declarative QUIET) find_package (Qt5Declarative QUIET)
find_package (Qt5Widgets QUIET) find_package (Qt5Widgets QUIET)
find_package (Qt5Gui QUIET) find_package (Qt5Gui QUIET)
...@@ -327,7 +327,7 @@ macro (acg_qt5) ...@@ -327,7 +327,7 @@ macro (acg_qt5)
AND Qt5PrintSupport_FOUND) AND Qt5PrintSupport_FOUND)
set (QT5_FOUND TRUE) set (QT5_FOUND TRUE)
endif() endif()
elseif(${QT_VERSION_MINOR} GREATER 5) else(${QT_VERSION_MINOR} GREATER 5)
if (Qt5Core_FOUND AND Qt5Declarative_FOUND AND Qt5Widgets_FOUND if (Qt5Core_FOUND AND Qt5Declarative_FOUND AND Qt5Widgets_FOUND
AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND AND Qt5Network_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND AND Qt5Network_FOUND
AND Qt5Script_FOUND AND Qt5ScriptTools_FOUND AND Qt5Sql_FOUND AND Qt5Script_FOUND AND Qt5ScriptTools_FOUND AND Qt5Sql_FOUND
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment