Skip to content

GitLab

Commit 09fe0a09 authored by Martin Schultz's avatar Martin Schultz
Browse files

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

machines
parent 7bb57f24
Show whitespace changes
Inline Side-by-side
cmake/FindQwt6.cmake
View file @ 09fe0a09
...@@ -28,8 +28,8 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" ) ...@@ -28,8 +28,8 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
endif() endif()
if (QT5_FOUND) if (QT5_FOUND)
if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.5.1" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1") 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-4.9-x86_64/qwt-6.1.2-qt5.6") SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.1.3-qt5.8.0")
else() else()
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5") SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
endif() endif()
......
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