commit 137f0b08d317ff02723fac13d1fa707782476635 Author: Ben Cooksley Date: Fri Jun 7 15:56:07 2013 +1200 Make sure we only match Qwt 5, and not 6 (cherry picked from commit c2ae5acf42e7d0575f0df0fd578191f4c5325719) diff --git a/applets/kdeobservatory/cmake/modules/FindQwt.cmake b/applets/kdeobservatory/cmake/modules/FindQwt.cmake index 940fc65..554858b 100644 --- a/applets/kdeobservatory/cmake/modules/FindQwt.cmake +++ b/applets/kdeobservatory/cmake/modules/FindQwt.cmake @@ -31,7 +31,7 @@ IF( QT4_FOUND ) # Find Qwt version IF( Qwt5_INCLUDE_DIR ) FILE( READ ${Qwt5_INCLUDE_DIR}/qwt_global.h QWT_GLOBAL_H ) - STRING( REGEX MATCH "#define *QWT_VERSION *(0x05*)" QWT_IS_VERSION_5 ${QWT_GLOBAL_H}) + STRING( REGEX MATCH "#define *QWT_VERSION *(0x05)" QWT_IS_VERSION_5 ${QWT_GLOBAL_H}) IF( QWT_IS_VERSION_5 ) STRING(REGEX REPLACE ".*#define[\\t\\ ]+QWT_VERSION_STR[\\t\\ ]+\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*" "\\1" Qwt_VERSION "${QWT_GLOBAL_H}")