[Commit-gnuradio] [gnuradio] 41/50: controlport: cmake fixes to FindThrift for when thrift is not installed.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 0d195a5a702703cc1f21d60a5c9217525380a94c
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 10 11:57:05 2015 -0400

    controlport: cmake fixes to FindThrift for when thrift is not installed.
---
 cmake/Modules/FindThrift.cmake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/FindThrift.cmake b/cmake/Modules/FindThrift.cmake
index 170ea48..f12bce0 100644
--- a/cmake/Modules/FindThrift.cmake
+++ b/cmake/Modules/FindThrift.cmake
@@ -1,7 +1,7 @@
 INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(PC_THRIFT thrift)
 
-set(THRIFT_REQ_VERSION "0.9.0")
+set(THRIFT_REQ_VERSION "0.9.2")
 
 # If pkg-config found Thrift and it doesn't meet our version
 # requirement, warn and exit -- does not cause an error; just doesn't
@@ -43,8 +43,14 @@ EXECUTE_PROCESS(
    OUTPUT_VARIABLE THRIFT_VERSION
    ERROR_VARIABLE THRIFT_VERSION_ERROR
    )
+
+if(NOT THRIFT_BIN)
+  message(STATUS "Binary 'thrift' not found.")
+  return()
+endif(NOT THRIFT_BIN)
+
 STRING(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+"
-  THRIFT_VERSION ${THRIFT_VERSION})
+  THRIFT_VERSION "${THRIFT_VERSION}")
 
 if(THRIFT_VERSION VERSION_LESS THRIFT_REQ_VERSION)
   message(STATUS "Could not find appropriate version of Thrift: 
${THRIFT_VERSION} < ${THRIFT_REQ_VERSION}")