<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/4230961fa9fd9f906db694779144af6c8e4a0160">https://github.com/macports/macports-ports/commit/4230961fa9fd9f906db694779144af6c8e4a0160</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 4230961 gnuradio-next: update to c1f706fb (20170607).
</span>4230961 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4230961fa9fd9f906db694779144af6c8e4a0160
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jun 13 08:38:22 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-next: update to c1f706fb (20170607).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> GNU Radio next branch requires new dependencies, new and updated patches.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Initial effort. Seems to work for me. Hoping others test and verify.
</span>---
science/gnuradio/Portfile | 78 +++++++++++++-----
.../gnuradio/files/patch-CMakeLists.txt.next.diff | 95 ++++++++++------------
.../gnuradio/files/patch-fix_includes.next.diff | 70 ++++++++++++++++
3 files changed, 171 insertions(+), 72 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 757d5eb..873922a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,12 +74,11 @@ subport gnuradio-next {
</span> name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 68eb2afc2128b2fe942a6be48c903dea6b4b4489
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20160816
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio c1f706fb1bec6a68191d44498c70d17226bd4ea7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170607
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 cb297ba374c6af5c7fded74a259333e2e171e8eb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6c6353f19e5dd4c54edf99a26fef778ce440e10270e498191c13732b02e61d7f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 61b0a0a8d7d4f3909f5049dab5e4e554ccf6d494 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a2610e66904e7eaa0801c48eed7d1d4d1a6a0be7daa95dd475e17587f67f19f9
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,6 +152,10 @@ if {${subport} eq "gnuradio"} {
</span>
patchfiles-append patch-CMakeLists.txt.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix include order
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix_includes.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
platform darwin 10 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,29 +332,62 @@ if {![variant_isset grc]} {
</span>
variant qtgui description "Install GNU Radio with support for Qt GUI" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 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:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qwtplot3d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "gnuradio" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport} eq "gnuradio-devel"} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # pyqt4 is checked for at configure, then required for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # runtime; so use depends_lib to get both. Can use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # either py*-pyqt4 or py*-pyqt4-devel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/py27-sip/PyQt4:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qwtplot3d
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Requires qwt >= 5.2, so not the "qwt" port. Also requires
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # py*-pyqwt which does not compile with qwt >= 6.0; so -have- to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use qwt52 for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pyqt4 is checked for at configure, then required for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # runtime; so use depends_lib to get both. Can use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # either py*-pyqt4 or py*-pyqt4-devel.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qwt52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:share/py27-sip/PyQt4:py27-pyqt4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # pyqwt is not checked for at configure, but is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # required for runtime; so use depends_run.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Requires qwt >= 5.2, so not the "qwt" port. Also requires
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # py*-pyqwt which does not compile with qwt >= 6.0; so -have- to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use qwt52 for now.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pyqwt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qwt52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants qwt52 qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pyqwt is not checked for at configure, but is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # required for runtime; so use depends_run.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pyqwt
</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;'>+ -DQWT_INCLUDE_DIRS=${prefix}/include/qwt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DQWT_LIBRARIES=${prefix}/lib/libqwt.dylib
</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;'>+ # next
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pyqt5 is checked for at configure, then required for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # runtime; so use depends_lib to get both. Can use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # either py*-pyqt5 or py*-pyqt5-devel.
</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;'>+ path:share/py27-sip/PyQt5:py27-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Requires qwt >= 6.0, installed with +qt5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qwt61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants qwt61 qt5
</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;'>+ -DQWT_INCLUDE_DIRS=${qt_dir}/include/qwt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DQWT_LIBRARIES=${qt_dir}/lib/libqwt.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
configure.args-append \
-DENABLE_GR_QTGUI=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-CMakeLists.txt.next.diff b/science/gnuradio/files/patch-CMakeLists.txt.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 03769c8..b84011c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-CMakeLists.txt.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-CMakeLists.txt.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +1,73 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,29 +56,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,30 +131,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(status "Skipping compiler version check.")
</span> ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# Set C/C++ standard for all targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# NOTE: Starting with cmake v3.1 this should be used:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# set(CMAKE_C_STANDARD 90)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# set(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Configure C++ and C standards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(CMAKE_VERSION VERSION_LESS "3.1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF()
</span> +# Configure C++ standard if not externally specified
+# (will actually be set after CppUnit check below)
+if(NOT CMAKE_CXX_STANDARD)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_CXX_STANDARD 98)
</span> +endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF()
</span> -ELSE()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_STANDARD 99)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_STANDARD 11)
</span> +# Configure C standard if not externally specified
+if(NOT CMAKE_C_STANDARD)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_C_STANDARD 99)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_C_STANDARD 99)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_C_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_C_STANDARD 90)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_C_STANDARD 90)
</span> +endif()
+IF(CMAKE_VERSION VERSION_LESS "3.1")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c${CMAKE_C_STANDARD}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c${CMAKE_C_STANDARD}")
</span> ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set cmake policies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -301,6 +299,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -365,6 +354,27 @@
</span> CPPUNIT_FOUND
)
+# check if CppUnit version is 1.14.0 or greater; requires c++11 ...
+
+if(CPPUNIT_FOUND AND NOT "${CPPUNIT_VERSION}" VERSION_LESS "1.14.0")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(WARNING "\nWarning: CppUnit version is ${CPPUNIT_VERSION} which requires C++11 for building. Trying to set CMake internally to use C++11 ...")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_CXX_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "\nWarning: CppUnit version is ${CPPUNIT_VERSION} which requires C++11 for building. Trying to set CMake internally to use C++11 ...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_CXX_STANDARD 11)
</span> +endif()
+
+# set actual C++ standard to use, if cmake version is < 3.1
+
+if(CMAKE_VERSION VERSION_LESS "3.1")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(WARNING "\nC++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(WARNING "\nC++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span> +endif()
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Setup volk as a subproject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(${CMAKE_BUILD_TYPE} STREQUAL "Coverage")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(CodeCoverage)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setup_target_for_coverage(coverage "ctest" coverage)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_includes.next.diff b/science/gnuradio/files/patch-fix_includes.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c15729a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_includes.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/gnuradio-runtime/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_BINARY_DIR}/gnuradio-runtime/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${LOG4CPP_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;'>+ GR_SET_GLOBAL(GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/apps/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/apps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LOG4CPP_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;'>+--- gnuradio-runtime/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,6 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/../include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LOG4CPP_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;'>+ if(ENABLE_CTRLPORT_THRIFT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/swig/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/swig/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LOG4CPP_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(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${VOLK_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;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/../include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GR_BLOCKS_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GNURADIO_RUNTIME_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;'>+ ${Boost_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;'>+--- gr-channels/lib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-channels/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GR_FILTER_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GR_ANALOG_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GNURADIO_RUNTIME_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;'>+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>