[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: cmake: better setup for finding QWT;
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: cmake: better setup for finding QWT; otherwise, it can be forced to incorrectly "find" non-existent QWT libs. |
|
Date: |
Thu, 1 May 2014 23:03:53 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch maint
in repository gnuradio.
commit 07e6734bab96ca48d5ef004e951a6f6c7284da63
Author: Tom Rondeau <address@hidden>
Date: Thu May 1 18:30:15 2014 -0400
cmake: better setup for finding QWT; otherwise, it can be forced to
incorrectly "find" non-existent QWT libs.
---
cmake/Modules/FindQwt.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
index 82f0780..b23ecdf 100644
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -37,6 +37,8 @@ set(QWT_FOUND FALSE)
if(QWT_INCLUDE_DIRS)
file(STRINGS "${QWT_INCLUDE_DIRS}/qwt_global.h"
QWT_STRING_VERSION REGEX "QWT_VERSION_STR")
+ set(QWT_WRONG_VERSION True)
+ 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.1.2" QWT_WRONG_VERSION)