[Commit-gnuradio] [gnuradio] 02/02: cmake: updates (basically reverts) commit 3c44ba0687b08.

[git]

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

trondeau pushed a commit to branch maint
in repository gnuradio.

commit c4b63337a77ade6c6d3456ede26acf7f5903845a
Author: Tom Rondeau <address@hidden>
Date:   Sun Feb 23 16:15:13 2014 -0500

    cmake: updates (basically reverts) commit 3c44ba0687b08.
    
    ICE 3.4.2 must be run with GCC 4.6 or less. Versions >= 4.7 will not work. 
All versions of GCC tested compile ICE 3.5.0/1. This check tests the version of 
GCC and if it is /NOT/ less than 4.6 (and therefore 4.7 or greater), then issue 
an error and disable ControlPort.
---
 cmake/Modules/FindICE.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/FindICE.cmake b/cmake/Modules/FindICE.cmake
index 1c84a90..087ee9b 100644
--- a/cmake/Modules/FindICE.cmake
+++ b/cmake/Modules/FindICE.cmake
@@ -116,12 +116,12 @@ if(ICE_ICE AND ICE_ICEUTIL)
       execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
         OUTPUT_VARIABLE gcc_version)
       string(REGEX MATCH "[0-9].[0-9].[0-9]" gcc_version_num ${gcc_version})
-      if(${gcc_version_num} VERSION_LESS "4.7")
+      if(NOT ${gcc_version_num} VERSION_LESS "4.7")
         message(STATUS "-- Found GCC version: ${gcc_version_num}")
         message(STATUS "-- GCC incompatible with Ice 3.4, disabling 
ControlPort")
         set(ICE_FOUND FALSE)
         return() # exit now
-      endif(${gcc_version_num} VERSION_LESS "4.7")
+      endif(NOT ${gcc_version_num} VERSION_LESS "4.7")
     endif(CMAKE_COMPILER_IS_GNUCXX)
 
     set(ICE_LIBRARIES ${ICE_LIBRARY})