Annotation of /trunk/kdeplasma-addons/patches/kdeplasma-addons-4.10.5-revert-only-qwt5.patch
Parent Directory
| 
Revision Log
Revision 2243 -
(hide annotations)
(download)
Mon Aug 5 07:53:55 2013 UTC (10 years, 9 months ago) by niro
File size: 995 byte(s)
Mon Aug 5 07:53:55 2013 UTC (10 years, 9 months ago) by niro
File size: 995 byte(s)
-fix build qith qwt6
| 1 | niro | 2243 | commit 137f0b08d317ff02723fac13d1fa707782476635 |
| 2 | Author: Ben Cooksley <bcooksley@kde.org> | ||
| 3 | Date: Fri Jun 7 15:56:07 2013 +1200 | ||
| 4 | |||
| 5 | Make sure we only match Qwt 5, and not 6 | ||
| 6 | (cherry picked from commit c2ae5acf42e7d0575f0df0fd578191f4c5325719) | ||
| 7 | |||
| 8 | diff --git a/applets/kdeobservatory/cmake/modules/FindQwt.cmake b/applets/kdeobservatory/cmake/modules/FindQwt.cmake | ||
| 9 | index 940fc65..554858b 100644 | ||
| 10 | --- a/applets/kdeobservatory/cmake/modules/FindQwt.cmake | ||
| 11 | +++ b/applets/kdeobservatory/cmake/modules/FindQwt.cmake | ||
| 12 | @@ -31,7 +31,7 @@ IF( QT4_FOUND ) | ||
| 13 | # Find Qwt version | ||
| 14 | IF( Qwt5_INCLUDE_DIR ) | ||
| 15 | FILE( READ ${Qwt5_INCLUDE_DIR}/qwt_global.h QWT_GLOBAL_H ) | ||
| 16 | - STRING( REGEX MATCH "#define *QWT_VERSION *(0x05*)" QWT_IS_VERSION_5 ${QWT_GLOBAL_H}) | ||
| 17 | + STRING( REGEX MATCH "#define *QWT_VERSION *(0x05)" QWT_IS_VERSION_5 ${QWT_GLOBAL_H}) | ||
| 18 | |||
| 19 | IF( QWT_IS_VERSION_5 ) | ||
| 20 | STRING(REGEX REPLACE ".*#define[\\t\\ ]+QWT_VERSION_STR[\\t\\ ]+\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*" "\\1" Qwt_VERSION "${QWT_GLOBAL_H}") |