<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f113c50278cd00d5c0413a078c8c453a7cfe8605">https://github.com/macports/macports-ports/commit/f113c50278cd00d5c0413a078c8c453a7cfe8605</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f113c50 gr-lora: augment with variants for different sources
</span>f113c50 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f113c50278cd00d5c0413a078c8c453a7cfe8605
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Sep 7 09:49:51 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> gr-lora: augment with variants for different sources
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Allow for installing the version from BastilleResearch of rpp0.
</span><span style='display:block; white-space:pre;color:#404040;'> Default to +rpp0, since it is being actively maintained.
</span>---
science/gr-lora/Portfile | 88 ++++++++++---
science/gr-lora/files/patch-build-fixes.diff | 189 +++++++++++++++++++++++++++
2 files changed, 260 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-lora/Portfile b/science/gr-lora/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be7eb8d..1ee75a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-lora/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-lora/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,68 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup BastilleResearch gr-lora d587169a9676ad0f9ebf85e6a840f3955b3976d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20170713
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 99f82eb4e57eb59c863598b6a5e58f3632edc769 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e1958cfe15e5ff3542e4df3dc7e626751321957cd2ff0122723d6a86d845cf6c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name gr-lora
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant BastilleResearch conflicts rpp0 description "Install gr-lora from BastilleResearch" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant rpp0 description conflicts BastilleResearch "Install gr-lora from rpp0" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set default variant if none selected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset BastilleResearch] && ![variant_isset rpp0]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +rpp0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# make sure -${default_variant} is not set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset BastilleResearch] && ![variant_isset rpp0]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "\nError: ${name} requires selection of variant +BastilleResearch or +rpp0.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset BastilleResearch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup BastilleResearch gr-lora d587169a9676ad0f9ebf85e6a840f3955b3976d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170713
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 99f82eb4e57eb59c863598b6a5e58f3632edc769 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e1958cfe15e5ff3542e4df3dc7e626751321957cd2ff0122723d6a86d845cf6c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset rpp0]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup rpp0 gr-lora 2605fa1772ff8943a2133ad3b06f58153a1ef163
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170907
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 96848e1c601798b85b7890d873ae74036ab2f1d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a5c89e967685d3b509f557865d60ac2e59b3b2e416b55bd311983286515a3ce3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:liquid-dsp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wireshark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix configuration and building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-build-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +mongodb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mongodb description "Include support for storing data to MongoDB" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset mongodb]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAS_MONGODB=TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py27-pymongo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAS_MONGODB=FALSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# allow gr-lora to work with both gnuradio and gnuradio-devel ...
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,16 +74,16 @@ pre-fetch {
</span> if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
# gnuradio-next is installed; this version of gr-lora does not work with gnuradio-next
ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid port dependency: gnuradio-next"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid port dependency: gnuradio-next"
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories science comms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers michaelld openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Provides augmented functionality (blocks, GRC definitions, apps, etc) for GNU Radio.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories science comms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers michaelld openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Provides augmented functionality (blocks, GRC definitions, apps, etc) for GNU Radio.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +115,8 @@ configure.args-append \
</span> -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7 \
-DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
-DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_MODULES_DIR=${prefix}/share/cmake
</span>
# use C++11
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-lora/files/patch-build-fixes.diff b/science/gr-lora/files/patch-build-fixes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ec822b1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-lora/files/patch-build-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,189 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit b0654dc630a8c5150c4ea2cfdefaf68d71db7037
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Michael Dickens <mlk@alum.mit.edu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu Sep 7 09:15:15 2017 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d4b6305..56136ec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,8 +117,6 @@ endif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find gnuradio build dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Doxygen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Search for GNU Radio and its components and versions. Add any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # components required to the list of GR_REQUIRED_COMPONENTS (in all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,13 +125,25 @@ find_package(Doxygen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(GR_REQUIRED_COMPONENTS RUNTIME FILTER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Gnuradio "3.7.2" REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT CPPUNIT_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "CppUnit required to compile lora")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "CppUnit required to compile gr-lora")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(Volk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT VOLK_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "Volk required to compile gr-lora")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(Liquid-DSP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT LIQUID_DSP_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "Liquid-DSP required to compile gr-lora")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Setup doxygen option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(Doxygen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(DOXYGEN_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(ENABLE_DOXYGEN "Build docs using Doxygen" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(DOXYGEN_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,12 +161,16 @@ include_directories(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CPPUNIT_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GNURADIO_ALL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LIQUID_DSP_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_directories(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_LIBRARY_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CPPUNIT_LIBRARY_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GNURADIO_RUNTIME_LIBRARY_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${VOLK_LIBRARY_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LIQUID_DSP_LIBRARY_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set component parameters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/Modules/FindLiquid-DSP.cmake b/cmake/Modules/FindLiquid-DSP.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..921bfbe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/Modules/FindLiquid-DSP.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Find the Liquid-DSP includes and library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# This module defines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIQUID_DSP_INCLUDE_DIR, where to find the main Liquid-DSP header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIQUID_DSP_LIBRARIES, the libraries to link against to use Liquid-DSP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIQUID_DSP_FOUND, If false, do not try to use Liquid-DSP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FIND_PATH(LIQUID_DSP_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NAMES liquid/liquid.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HINTS ${LIQUID_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_INSTALL_PREFIX}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PATHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /usr/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FIND_LIBRARY(LIQUID_DSP_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NAMES liquid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HINTS ${LIQUID_DIR}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LIQUID_DSP_INCLUDE_DIRS}/../lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_INSTALL_PREFIX}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CMAKE_INSTALL_PREFIX}/lib64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PATHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /opt/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDE(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIQUID_DSP DEFAULT_MSG LIQUID_DSP_LIBRARIES LIQUID_DSP_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MARK_AS_ADVANCED(LIQUID_DSP_LIBRARIES LIQUID_DSP_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8659c0f..877145a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,9 +22,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GrPlatform) #define LIB_SUFFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${Boost_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-link_directories(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND lora_sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ decoder_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message_file_sink_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,22 +31,17 @@ list(APPEND lora_sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debugger.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(lora_sources "${lora_sources}" PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT lora_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(STATUS "No C++ sources... skipping lib/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(NOT lora_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++list(APPEND lora_libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${Boost_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${GNURADIO_ALL_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${VOLK_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LIQUID_DSP_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(gnuradio-lora SHARED ${lora_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(gnuradio-lora ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES} liquid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(gnuradio-lora ${lora_libs})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(gnuradio-lora PROPERTIES DEFINE_SYMBOL "gnuradio_lora_EXPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(gnuradio-lora PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install built library files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,11 +68,9 @@ add_executable(test-lora ${test_lora_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test-lora
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${GNURADIO_RUNTIME_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${Boost_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CPPUNIT_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnuradio-lora
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- liquid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${lora_libs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${CPPUNIT_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_ADD_TEST(test_lora test-lora)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2f2a0d2..9bbfb71 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,4 +53,4 @@ set(GR_TEST_TARGET_DEPS gnuradio-lora)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_ADD_TEST(qa_receiver ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_receiver.py)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GR_ADD_TEST(qa_BasicTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_BasicTest.py)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GR_ADD_TEST(qa_BasicTest_XML ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_BasicTest_XML.py)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# GR_ADD_TEST(qa_BasicTest_XML ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_BasicTest_XML.py)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9c120fc..a507c92 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/swig/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/swig/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,14 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the Free Software Foundation, Inc., 51 Franklin Street,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Boston, MA 02110-1301, USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Check if there is C++ code at all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT lora_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(STATUS "No C++ sources... skipping swig/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(NOT lora_sources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Include swig generation macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span></pre><pre style='margin:0'>
</pre>