Commit 5b7e2c03 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'findqwt-fix' into 'master'

only set QWT 6.1.2 ACG default search path if QT version is >= 5.5.1



See merge request !40
parents e5f9ed0d ac6ac066
Pipeline #219 passed with stage
......@@ -21,7 +21,11 @@ endif()
if (QT5_FOUND)
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5")
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")
else()
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
endif()
else()
SET(ACG_SEARCH_PATH "/usr/local/qwt/")
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