[Commit-gnuradio] [gnuradio] 01/01: cmake: fixed boost version test

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 69477ad4a0a38c3a2968440fad41d7890aff61b6
Author: Johnathan Corgan <address@hidden>
Date:   Thu Oct 30 14:03:24 2014 -0700

    cmake: fixed boost version test
    
    "if(${Boost_VERSION} EQUAL ${ver})" fixed
    
    if §{Boost_VERSION} is unset, the expression expands to something like
    if( EQUAL "104601" )
    which generates a parser error. Since it's a string comparison, anyway,
    I replaced it by the specific
    if("${Boost_VERSION}" STREQUAL ${ver})
    
    fed
---
 cmake/Modules/GrBoost.cmake | 4 ++--
 volk/cmake/VolkBoost.cmake  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake
index d2e91a6..fcac5cf 100644
--- a/cmake/Modules/GrBoost.cmake
+++ b/cmake/Modules/GrBoost.cmake
@@ -87,7 +87,7 @@ set(Boost_NOGO_VERSIONS
   )
 
 foreach(ver ${Boost_NOGO_VERSIONS})
-  if(${Boost_VERSION} EQUAL ${ver})
+  if("${Boost_VERSION}" STREQUAL "${ver}")
     if(NOT ENABLE_BAD_BOOST)
       MESSAGE(STATUS "WARNING: Found a known bad version of Boost 
(v${Boost_VERSION}). Disabling.")
       set(Boost_FOUND FALSE)
@@ -95,5 +95,5 @@ foreach(ver ${Boost_NOGO_VERSIONS})
       MESSAGE(STATUS "WARNING: Found a known bad version of Boost 
(v${Boost_VERSION}). Continuing anyway.")
       set(Boost_FOUND TRUE)
     endif(NOT ENABLE_BAD_BOOST)
-  endif(${Boost_VERSION} EQUAL ${ver})
+  endif("${Boost_VERSION}" STREQUAL "${ver}")
 endforeach(ver)
diff --git a/volk/cmake/VolkBoost.cmake b/volk/cmake/VolkBoost.cmake
index 318820e..9afa9f8 100644
--- a/volk/cmake/VolkBoost.cmake
+++ b/volk/cmake/VolkBoost.cmake
@@ -86,7 +86,7 @@ set(Boost_NOGO_VERSIONS
   )
 
 foreach(ver ${Boost_NOGO_VERSIONS})
-  if(${Boost_VERSION} EQUAL ${ver})
+  if("${Boost_VERSION}" STREQUAL "${ver}")
     if(NOT ENABLE_BAD_BOOST)
       MESSAGE(STATUS "WARNING: Found a known bad version of Boost 
(v${Boost_VERSION}). Disabling.")
       set(Boost_FOUND FALSE)
@@ -94,5 +94,5 @@ foreach(ver ${Boost_NOGO_VERSIONS})
       MESSAGE(STATUS "WARNING: Found a known bad version of Boost 
(v${Boost_VERSION}). Continuing anyway.")
       set(Boost_FOUND TRUE)
     endif(NOT ENABLE_BAD_BOOST)
-  endif(${Boost_VERSION} EQUAL ${ver})
+  endif("${Boost_VERSION}" STREQUAL "${ver}")
 endforeach(ver)