File qt-dab-6.8-use-qwt6-qt5.patch of Package qt-dab6

File qt-dab-6.8-use-qwt6-qt5.patch of Package qt-dab6 (Revision 2)

Currently displaying revision 2 , Show latest

diff -up qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake.aaaa qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake
--- qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake.aaaa	2024-11-10 14:14:47.000000000 +0100
+++ qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake	2024-11-11 11:51:11.165486510 +0100
@@ -17,6 +17,7 @@ find_path(QWT_INCLUDE_DIRS
 	/usr/include/qwt5
 	/usr/include/qwt6-qt5
 	/usr/include/qt5/qwt
+	/usr/include/qt5/qwt6
 	/opt/local/include/qwt
 	/sw/include/qwt
 	/usr/local/lib/qwt.framework/Headers
@@ -50,13 +51,12 @@ if(QWT_INCLUDE_DIRS)
   set(QWT_VERSION "No Version")
   string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION})
   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
 
   message(STATUS "QWT Version: ${QWT_VERSION}")
   if(NOT QWT_WRONG_VERSION)
     set(QWT_FOUND TRUE)
   else(NOT QWT_WRONG_VERSION)
-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
+    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
   endif(NOT QWT_WRONG_VERSION)
 
 endif(QWT_INCLUDE_DIRS)