[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/14: cmake: better setup for finding QWT;
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/14: cmake: better setup for finding QWT; otherwise, it can be forced to incorrectly "find" non-existent QWT libs. |
Date: |
Fri, 9 May 2014 22:28:42 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 6a1cd24d96328d50c4075bf7d37f0b937ac45414
Author: Tom Rondeau <address@hidden>
Date: Thu May 1 12:19:05 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 1a246c8..1e82cb9 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.2.0" QWT_WRONG_VERSION)
- [Commit-gnuradio] [gnuradio] branch master updated (8c97b7c -> 432e3b7), git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 04/14: Merge branch 'master' of git.gnuradio.org:gnuradio, git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 06/14: gr-filter: Add a convenience freq_xlating_fft_filter block, git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 11/14: Merge remote-tracking branch 'smunaut/fft-filter', git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 08/14: Merge remote-tracking branch 'osh/typo_fix', git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 13/14: Merge branch 'maint', git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 14/14: Merge remote-tracking branch 'tom/cmake_ice_libs', git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 05/14: cmake: fixing up FindICE to handle more possible install cases., git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 01/14: cmake: better setup for finding QWT; otherwise, it can be forced to incorrectly "find" non-existent QWT libs.,
git <=
- [Commit-gnuradio] [gnuradio] 09/14: gr-digital: update the HDLC blocks., git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 10/14: Merge branch 'hdlc_update', git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 12/14: Merge remote-tracking branch 'osh/cpx_to_ishort_vector', git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 07/14: blocks: add vector output option param to complex_to_interleaved_short to match interleaved_short_to_complex, git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 02/14: pmt: adding pmt::dict_update(dict1, dict2) function for merging dictionaries, git, 2014/05/09
- [Commit-gnuradio] [gnuradio] 03/14: runtime: ieieieieieieieieieieieieieieieieieieieieieeieiieieieiieieieieieieieieieiieiieieiie, git, 2014/05/09