[Commit-gnuradio] [gnuradio] 01/23: volk: cmake: Rename GrBoost to VolkBoost to differentiate it from GR's GrBoost. Although they set the same BOOST variables internally, this change make it clear which cmake file to include.

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit acfe874e310956a5b583d218c3781d6c72418a0e
Author: Michael Dickens <address@hidden>
Date:   Mon Jun 23 10:10:43 2014 -0400

    volk: cmake: Rename GrBoost to VolkBoost to differentiate it from GR's 
GrBoost. Although they set the same BOOST variables internally, this change 
make it clear which cmake file to include.
---
 volk/CMakeLists.txt                           | 2 +-
 volk/cmake/{GrBoost.cmake => VolkBoost.cmake} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt
index cf651ed..cb548f5 100644
--- a/volk/CMakeLists.txt
+++ b/volk/CMakeLists.txt
@@ -73,7 +73,7 @@ if(MSVC)
         unset(BOOST_REQUIRED_COMPONENTS) #empty components list for static link
     endif(BOOST_ALL_DYN_LINK)
 endif(MSVC)
-include(GrBoost)
+include(VolkBoost)
 
 if(NOT Boost_FOUND)
     message(FATAL_ERROR "VOLK Requires boost to build")
diff --git a/volk/cmake/GrBoost.cmake b/volk/cmake/VolkBoost.cmake
similarity index 98%
rename from volk/cmake/GrBoost.cmake
rename to volk/cmake/VolkBoost.cmake
index 8b0f07f..318820e 100644
--- a/volk/cmake/GrBoost.cmake
+++ b/volk/cmake/VolkBoost.cmake
@@ -17,10 +17,10 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-if(DEFINED __INCLUDED_GR_BOOST_CMAKE)
+if(DEFINED __INCLUDED_VOLK_BOOST_CMAKE)
     return()
 endif()
-set(__INCLUDED_GR_BOOST_CMAKE TRUE)
+set(__INCLUDED_VOLK_BOOST_CMAKE TRUE)
 
 ########################################################################
 # Setup Boost and handle some system specific things