Skip to content
Snippets Groups Projects
Commit adb0116d authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'findQWT6.1.3' into 'master'

modified finder for QWT to find qwt 6.1.3 built with qt 5.8 on our lab

See merge request !12
parents 7bb57f24 09fe0a09
No related branches found
No related tags found
1 merge request!12modified finder for QWT to find qwt 6.1.3 built with qt 5.8 on our lab
......@@ -28,8 +28,8 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
endif()
if (QT5_FOUND)
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.5.1" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5.6")
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.8.0" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0")
else()
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment