Merge branch 'maint'

author: Johnathan Corgan <johnathan@corganlabs.com> 2013-06-09 12:29:31 -0400
committer: Johnathan Corgan <johnathan@corganlabs.com> 2013-06-09 12:29:58 -0400
commit: 59cbadf9edb3562b95359119e91058765827c938 (patch)
tree: 3065856cbb9ea81511eb0adc47ddaaf9cf2c1af6 /cmake
parent: 5d5bfedd0ceeac78967b8d2ef2c486ef2e7078e6 (diff)
parent: c8c2fe543aeed38059a45bfaa53990978577eea8 (diff)
2 files changed, 142 insertions, 142 deletions
diff --git a/cmake/Modules/FindGnuradio.cmake b/cmake/Modules/FindGnuradio.cmake
index 80be72dc8c..a6763c529e 100644
--- a/cmake/Modules/FindGnuradio.cmake
+++ b/cmake/Modules/FindGnuradio.cmake
@@ -1,108 +1,108 @@
-INCLUDE(FindPkgConfig)
-INCLUDE(FindPackageHandleStandardArgs)
-
-# a subset of required modules can be set using the following syntax
-#set(GR_REQUIRED_MODULES RUNTIME BLOCKS)
-
-# if GR_REQUIRED_MODULES is not defined, it will be set to the following list (all of them)
-if(NOT GR_REQUIRED_MODULES)
-    set(GR_REQUIRED_MODULES RUNTIME ANALOG ATSC AUDIO BLOCKS CHANNELS DIGITAL FEC FFT FILTER NOAA PAGER QTGUI TRELLIS UHD VOCODER WAVELET PMT)
-endif()
-
-set(GNURADIO_ALL_LIBRARIES "")
-set(GNURADIO_ALL_INCLUDE_DIRS "")
-
-MACRO(LIST_CONTAINS var value)
-    SET(${var})
-    FOREACH(value2 ${ARGN})
-        IF (${value} STREQUAL ${value2})
-            SET(${var} TRUE)
-        ENDIF(${value} STREQUAL ${value2})
-    ENDFOREACH(value2)
-ENDMACRO(LIST_CONTAINS)
-
-function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE)
-
-    LIST_CONTAINS(REQUIRED_MODULE ${EXTVAR} ${GR_REQUIRED_MODULES})
-    if(NOT REQUIRED_MODULE)
-        #message("Ignoring GNU Radio Module ${EXTVAR}")
-        return()
-    endif()
-
-    message("Checking for GNU Radio Module: ${EXTVAR}")
-
-    # check for .pc hints
-    PKG_CHECK_MODULES(PC_GNURADIO_${EXTVAR} ${PCNAME})
-
-    set(INCVAR_NAME "GNURADIO_${EXTVAR}_INCLUDE_DIRS")
-    set(LIBVAR_NAME "GNURADIO_${EXTVAR}_LIBRARIES")
-    set(PC_INCDIR "PC_GNURADIO_${EXTVAR}_INCLUDEDIR")
-    set(PC_LIBDIR "PC_GNURADIO_${EXTVAR}_LIBDIR")
-
-    # look for include files
-    FIND_PATH(
-        ${INCVAR_NAME}
-        NAMES ${INCFILE}
-        HINTS $ENV{GNURADIO_RUNTIME_DIR}/include/gnuradio
-            ${PC_INCDIR}
-            ${CMAKE_INSTALL_PREFIX}/include/gnuradio
-        PATHS /usr/local/include/gnuradio
-              /usr/include/gnuradio
-    )
-
-    # look for libs
-    FIND_LIBRARY(
-        ${LIBVAR_NAME}
-        NAMES ${LIBFILE}
-        HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib
-            ${PC_LIBDIR}
-            ${CMAKE_INSTALL_PREFIX}/lib/
-            ${CMAKE_INSTALL_PREFIX}/lib64/
-        PATHS /usr/local/lib
-              /usr/local/lib64
-              /usr/lib
-              /usr/lib64
-    )
-
-    # show results
-    message(" * INCLUDES=${GNURADIO_${EXTVAR}_INCLUDE_DIRS}")
-    message(" * LIBS=${GNURADIO_${EXTVAR}_LIBRARIES}")
-
-    # append to all includes and libs list
-    LIST(APPEND GNURADIO_ALL_INCLUDE_DIRS ${GNURADIO_${EXTVAR}_INCLUDE_DIRS})
-    LIST(APPEND GNURADIO_ALL_LIBRARIES ${GNURADIO_${EXTVAR}_LIBRARIES})
-
-    FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_${EXTVAR} DEFAULT_MSG GNURADIO_${EXTVAR}_LIBRARIES GNURADIO_${EXTVAR}_INCLUDE_DIRS)
-    message("GNURADIO_${EXTVAR}_FOUND = ${GNURADIO_${EXTVAR}_FOUND}")
-    set(GNURADIO_${EXTVAR}_FOUND ${GNURADIO_${EXTVAR}_FOUND} PARENT_SCOPE)
-
-    # generate an error if the module is missing
-    if(NOT GNURADIO_${EXTVAR}_FOUND)
-       message(FATAL_ERROR "Required GNU Radio Component: ${EXTVAR} missing!")
-    endif()
-
-    MARK_AS_ADVANCED(GNURADIO_${EXTVAR}_LIBRARIES GNURADIO_${EXTVAR}_INCLUDE_DIRS)
-
-endfunction()
-
-GR_MODULE(CORE gnuradio-runtime gr_top_block.h gnuradio-runtime)
-GR_MODULE(RUNTIME gnuradio-runtime gr_top_block.h gnuradio-runtime)
-GR_MODULE(ANALOG gnuradio-analog analog/noise_type.h gnuradio-analog)
-GR_MODULE(ATSC gnuradio-atsc atsc_api.h gnuradio-atsc)
-GR_MODULE(AUDIO gnuradio-audio audio/sink.h gnuradio-audio)
-GR_MODULE(BLOCKS gnuradio-blocks blocks/delay.h gnuradio-blocks)
-GR_MODULE(CHANNELS gnuradio-channels channels/channel_model.h gnuradio-channels)
-GR_MODULE(DIGITAL gnuradio-digital digital/lfsr.h gnuradio-digital)
-GR_MODULE(FEC gnuradio-fec fec/rs.h gnuradio-fec)
-GR_MODULE(FFT gnuradio-fft fft/fft.h gnuradio-fft)
-GR_MODULE(FILTER gnuradio-filter filter/fir_filter.h gnuradio-filter)
-GR_MODULE(NOAA gnuradio-noaa noaa/hrpt.h gnuradio-noaa)
-GR_MODULE(PAGER gnuradio-pager noaa/flex_deinterleave.h gnuradio-pager)
-GR_MODULE(QTGUI gnuradio-qtgui qtgui/utils.h gnuradio-qtgui)
-GR_MODULE(TRELLIS gnuradio-trellis trellis/fsm.h gnuradio-trellis)
-GR_MODULE(UHD gnuradio-uhd gr_uhd/usrp_sink.h gnuradio-uhd)
-GR_MODULE(VOCODER gnuradio-vocoder vocoder/alaw_encode_sb.h gnuradio-vocoder)
-GR_MODULE(WAVELET gnuradio-wavelet wavelet/wavelet_ff.h gnuradio-wavelet)
-GR_MODULE(PMT gnuradio-pmt pmt/pmt.h gnuradio-pmt)
-
-
+INCLUDE(FindPkgConfig)
+INCLUDE(FindPackageHandleStandardArgs)
+
+# a subset of required modules can be set using the following syntax
+#set(GR_REQUIRED_MODULES RUNTIME BLOCKS)
+
+# if GR_REQUIRED_MODULES is not defined, it will be set to the following list (all of them)
+if(NOT GR_REQUIRED_MODULES)
+    set(GR_REQUIRED_MODULES RUNTIME ANALOG ATSC AUDIO BLOCKS CHANNELS DIGITAL FEC FFT FILTER NOAA PAGER QTGUI TRELLIS UHD VOCODER WAVELET PMT)
+endif()
+
+set(GNURADIO_ALL_LIBRARIES "")
+set(GNURADIO_ALL_INCLUDE_DIRS "")
+
+MACRO(LIST_CONTAINS var value)
+    SET(${var})
+    FOREACH(value2 ${ARGN})
+        IF (${value} STREQUAL ${value2})
+            SET(${var} TRUE)
+        ENDIF(${value} STREQUAL ${value2})
+    ENDFOREACH(value2)
+ENDMACRO(LIST_CONTAINS)
+
+function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE)
+
+    LIST_CONTAINS(REQUIRED_MODULE ${EXTVAR} ${GR_REQUIRED_MODULES})
+    if(NOT REQUIRED_MODULE)
+        #message("Ignoring GNU Radio Module ${EXTVAR}")
+        return()
+    endif()
+
+    message("Checking for GNU Radio Module: ${EXTVAR}")
+
+    # check for .pc hints
+    PKG_CHECK_MODULES(PC_GNURADIO_${EXTVAR} ${PCNAME})
+
+    set(INCVAR_NAME "GNURADIO_${EXTVAR}_INCLUDE_DIRS")
+    set(LIBVAR_NAME "GNURADIO_${EXTVAR}_LIBRARIES")
+    set(PC_INCDIR "PC_GNURADIO_${EXTVAR}_INCLUDEDIR")
+    set(PC_LIBDIR "PC_GNURADIO_${EXTVAR}_LIBDIR")
+
+    # look for include files
+    FIND_PATH(
+        ${INCVAR_NAME}
+        NAMES ${INCFILE}
+        HINTS $ENV{GNURADIO_RUNTIME_DIR}/include/gnuradio
+            ${PC_INCDIR}
+            ${CMAKE_INSTALL_PREFIX}/include/gnuradio
+        PATHS /usr/local/include/gnuradio
+              /usr/include/gnuradio
+    )
+
+    # look for libs
+    FIND_LIBRARY(
+        ${LIBVAR_NAME}
+        NAMES ${LIBFILE}
+        HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib
+            ${PC_LIBDIR}
+            ${CMAKE_INSTALL_PREFIX}/lib/
+            ${CMAKE_INSTALL_PREFIX}/lib64/
+        PATHS /usr/local/lib
+              /usr/local/lib64
+              /usr/lib
+              /usr/lib64
+    )
+
+    # show results
+    message(" * INCLUDES=${GNURADIO_${EXTVAR}_INCLUDE_DIRS}")
+    message(" * LIBS=${GNURADIO_${EXTVAR}_LIBRARIES}")
+
+    # append to all includes and libs list
+    LIST(APPEND GNURADIO_ALL_INCLUDE_DIRS ${GNURADIO_${EXTVAR}_INCLUDE_DIRS})
+    LIST(APPEND GNURADIO_ALL_LIBRARIES ${GNURADIO_${EXTVAR}_LIBRARIES})
+
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_${EXTVAR} DEFAULT_MSG GNURADIO_${EXTVAR}_LIBRARIES GNURADIO_${EXTVAR}_INCLUDE_DIRS)
+    message("GNURADIO_${EXTVAR}_FOUND = ${GNURADIO_${EXTVAR}_FOUND}")
+    set(GNURADIO_${EXTVAR}_FOUND ${GNURADIO_${EXTVAR}_FOUND} PARENT_SCOPE)
+
+    # generate an error if the module is missing
+    if(NOT GNURADIO_${EXTVAR}_FOUND)
+       message(FATAL_ERROR "Required GNU Radio Component: ${EXTVAR} missing!")
+    endif()
+
+    MARK_AS_ADVANCED(GNURADIO_${EXTVAR}_LIBRARIES GNURADIO_${EXTVAR}_INCLUDE_DIRS)
+
+endfunction()
+
+GR_MODULE(CORE gnuradio-runtime gr_top_block.h gnuradio-runtime)
+GR_MODULE(RUNTIME gnuradio-runtime gr_top_block.h gnuradio-runtime)
+GR_MODULE(ANALOG gnuradio-analog analog/noise_type.h gnuradio-analog)
+GR_MODULE(ATSC gnuradio-atsc atsc_api.h gnuradio-atsc)
+GR_MODULE(AUDIO gnuradio-audio audio/sink.h gnuradio-audio)
+GR_MODULE(BLOCKS gnuradio-blocks blocks/delay.h gnuradio-blocks)
+GR_MODULE(CHANNELS gnuradio-channels channels/channel_model.h gnuradio-channels)
+GR_MODULE(DIGITAL gnuradio-digital digital/lfsr.h gnuradio-digital)
+GR_MODULE(FEC gnuradio-fec fec/rs.h gnuradio-fec)
+GR_MODULE(FFT gnuradio-fft fft/fft.h gnuradio-fft)
+GR_MODULE(FILTER gnuradio-filter filter/fir_filter.h gnuradio-filter)
+GR_MODULE(NOAA gnuradio-noaa noaa/hrpt.h gnuradio-noaa)
+GR_MODULE(PAGER gnuradio-pager noaa/flex_deinterleave.h gnuradio-pager)
+GR_MODULE(QTGUI gnuradio-qtgui qtgui/utils.h gnuradio-qtgui)
+GR_MODULE(TRELLIS gnuradio-trellis trellis/fsm.h gnuradio-trellis)
+GR_MODULE(UHD gnuradio-uhd gr_uhd/usrp_sink.h gnuradio-uhd)
+GR_MODULE(VOCODER gnuradio-vocoder vocoder/alaw_encode_sb.h gnuradio-vocoder)
+GR_MODULE(WAVELET gnuradio-wavelet wavelet/wavelet_ff.h gnuradio-wavelet)
+GR_MODULE(PMT gnuradio-pmt pmt/pmt.h gnuradio-pmt)
+
+
diff --git a/cmake/Modules/GnuradioConfigVersion.cmake.in b/cmake/Modules/GnuradioConfigVersion.cmake.in
index a9717a7e5a..4e3d626176 100644
--- a/cmake/Modules/GnuradioConfigVersion.cmake.in
+++ b/cmake/Modules/GnuradioConfigVersion.cmake.in
@@ -1,35 +1,35 @@
-# Copyright 2013 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-set(MAJOR_VERSION @VERSION_INFO_MAJOR_VERSION@)
-set(API_COMPAT @VERSION_INFO_API_COMPAT@)
-set(MINOR_VERSION @VERSION_INFO_MINOR_VERSION@)
-set(MAINT_VERSION @VERSION_INFO_MAINT_VERSION@)
-
-set(PACKAGE_VERSION
-  ${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}.${MAINT_VERSION})
-
-if(${PACKAGE_FIND_VERSION_MAJOR} EQUAL ${MAJOR_VERSION})
-  if(${PACKAGE_FIND_VERSION_MINOR} EQUAL ${API_COMPAT})
-    if(NOT ${PACKAGE_FIND_VERSION_PATCH} GREATER ${MINOR_VERSION})
-      set(PACKAGE_VERSION_EXACT 1)    # exact match for API version
-      set(PACKAGE_VERSION_COMPATIBLE 1)  # compat for minor/patch version
-    endif(NOT ${PACKAGE_FIND_VERSION_PATCH} GREATER ${MINOR_VERSION})
-  endif(${PACKAGE_FIND_VERSION_MINOR} EQUAL ${API_COMPAT})
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+set(MAJOR_VERSION @VERSION_INFO_MAJOR_VERSION@)
+set(API_COMPAT @VERSION_INFO_API_COMPAT@)
+set(MINOR_VERSION @VERSION_INFO_MINOR_VERSION@)
+set(MAINT_VERSION @VERSION_INFO_MAINT_VERSION@)
+
+set(PACKAGE_VERSION
+  ${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}.${MAINT_VERSION})
+
+if(${PACKAGE_FIND_VERSION_MAJOR} EQUAL ${MAJOR_VERSION})
+  if(${PACKAGE_FIND_VERSION_MINOR} EQUAL ${API_COMPAT})
+    if(NOT ${PACKAGE_FIND_VERSION_PATCH} GREATER ${MINOR_VERSION})
+      set(PACKAGE_VERSION_EXACT 1)    # exact match for API version
+      set(PACKAGE_VERSION_COMPATIBLE 1)  # compat for minor/patch version
+    endif(NOT ${PACKAGE_FIND_VERSION_PATCH} GREATER ${MINOR_VERSION})
+  endif(${PACKAGE_FIND_VERSION_MINOR} EQUAL ${API_COMPAT})
 endif(${PACKAGE_FIND_VERSION_MAJOR} EQUAL ${MAJOR_VERSION})
 \ No newline at end of file
author	Johnathan Corgan <johnathan@corganlabs.com>	2013-06-09 12:29:31 -0400
committer	Johnathan Corgan <johnathan@corganlabs.com>	2013-06-09 12:29:58 -0400
commit	59cbadf9edb3562b95359119e91058765827c938 (patch)
tree	3065856cbb9ea81511eb0adc47ddaaf9cf2c1af6 /cmake
parent	5d5bfedd0ceeac78967b8d2ef2c486ef2e7078e6 (diff)
parent	c8c2fe543aeed38059a45bfaa53990978577eea8 (diff)