From 94161d7b247467bde3988700dec6bbb91478df31 Mon Sep 17 00:00:00 2001 From: Manolis Surligas Date: Wed, 26 Oct 2016 20:36:07 +0300 Subject: [PATCH] Change the build system requirements on GNU Radio version and libnova --- CMakeLists.txt | 26 ++++++++++++++------------ README.md | 18 ++++++++++-------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4603054..f36c25b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,12 +116,22 @@ find_package (Threads REQUIRED) find_package(CppUnit) find_package(Doxygen) +######################################################################## +# Include or not into the module blocks for debugging +######################################################################## +if(NOT INCLUDE_DEBUG_BLOCKS) + set(INCLUDE_DEBUG_BLOCKS ON CACHE BOOL + "Disable blocks that are used for debugging purposes") +endif() + ######################################################################## # Find gr-satnogs external build dependencies ######################################################################## -find_package(Nova) -if(NOT NOVA_FOUND) - message(FATAL_ERROR "libnova required to compile satnogs") +if(${INCLUDE_DEBUG_BLOCKS}) + find_package(Nova) + if(NOT NOVA_FOUND) + message(FATAL_ERROR "libnova required to compile satnogs") + endif() endif() # Search for GNU Radio and its components and versions. Add any @@ -129,7 +139,7 @@ endif() # caps such as FILTER or FFT) and change the version to the minimum # API compatible version required. set(GR_REQUIRED_COMPONENTS RUNTIME) -find_package(Gnuradio "3.7.2" REQUIRED) +find_package(Gnuradio "3.7.7" REQUIRED) if(NOT CPPUNIT_FOUND) message(FATAL_ERROR "CppUnit required to compile satnogs") @@ -144,14 +154,6 @@ else(DOXYGEN_FOUND) option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF) endif(DOXYGEN_FOUND) -######################################################################## -# Include or not into the module blocks for debugging -######################################################################## -if(NOT INCLUDE_DEBUG_BLOCKS) - set(INCLUDE_DEBUG_BLOCKS ON CACHE BOOL - "Disable blocks that are used for debugging purposes") -endif() - ######################################################################## # Setup the include and linker paths ######################################################################## diff --git a/README.md b/README.md index 438af03..ba1f62e 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,14 @@ for decoding signals from various scientific and academic sattelites. ## Install ### Requirements -1. GNU Radio ( > 3.7.2 ) -2. CMake ( > 3.1) -3. G++ (with C++11 support) -4. VOLK -5. git -6. gr-osmocom (optional, for using the flowgraphs) +* GNU Radio ( > 3.7.2 ) +* CMake ( > 3.1) +* G++ (with C++11 support) +* VOLK +* git +*** Optional *** +* gr-osmocom (for using the flowgraphs with real SDR hardware) +* libnova (for building the debug blocks) ### Installation @@ -32,9 +34,9 @@ E.g: `cmake -DCMAKE_INSTALL_PREFIX=/usr ..` -Also, by default the build system disables a set of blocks used for debugging +Also, by default the build system enables a set of blocks used for debugging during the development. The enable/disable switch is controled through the -`INCLUDE_DEBUG_BLOCKS` boolean variable. If for example, you want to enable the +`INCLUDE_DEBUG_BLOCKS` boolean variable. If for example, you want to disable the debugging blocks, the **CMake** command would be: `cmake -DINCLUDE_DEBUG_BLOCKS=OFF ..`