<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/439677773d29c2f391d45b6c61bdb83f40d7c83f">https://github.com/macports/macports-ports/commit/439677773d29c2f391d45b6c61bdb83f40d7c83f</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 4396777 gnuradio*: better fix for setting of the C++ standard internal to GR.
</span>4396777 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 439677773d29c2f391d45b6c61bdb83f40d7c83f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed May 24 11:36:45 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio*: better fix for setting of the C++ standard internal to GR.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix setting of the C++ standard internal to GR, with internal checking depending on version of CppUnit & allowing MacPorts to decide the setting. Fix comments for those patches to reflect what they do.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove now-unnecessary cmake setting for C++11.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove oops audio debug comment.
</span>---
.../gnuradio/files/patch-CMakeLists.txt.devel.diff | 61 +++++++++++++++++----
.../gnuradio/files/patch-CMakeLists.txt.next.diff | 62 +++++++++++++++++++---
.../files/patch-CMakeLists.txt.release.diff | 62 +++++++++++++++++++---
.../patch-cmake_Modules_FindCppUnit.cmake.diff | 12 +++++
4 files changed, 171 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-CMakeLists.txt.devel.diff b/science/gnuradio/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 286c0a9..0836179 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,32 +131,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,30 +131,27 @@
</span> MESSAGE(status "Skipping compiler version check.")
ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,21 +15,62 @@
</span> - ELSE()
- MESSAGE(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
- ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><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:#e0ffe0;'>++# Configure C++ standard if not externally specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# (will actually be set after CppUnit check below)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_CXX_STANDARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_CXX_STANDARD 98)
</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;'>++# Configure C standard if not externally specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_C_STANDARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span> - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
<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:#e0ffe0;'>++ SET(CMAKE_C_STANDARD 99)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span> - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
<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:#e0ffe0;'>++ SET(CMAKE_C_STANDARD 99)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span> - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_C_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span> - MESSAGE(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span> -ELSE()
- SET(CMAKE_C_STANDARD 90)
- SET(CMAKE_CXX_STANDARD 98)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</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;'>++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c${CMAKE_C_STANDARD}")
</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;'>+@@ -365,6 +362,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPUNIT_FOUND
</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 CppUnit version is 1.14.0 or greater; requires c++11 ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(CPPUNIT_FOUND AND NOT "${CPPUNIT_VERSION}" VERSION_LESS "1.14.0")
</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><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;'>++# set actual C++ standard to use, if cmake version is < 3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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++${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><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:#ffe0e0;'>- # Environment setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add optional dlls specified in DLL_PATHS
</span> ########################################################################
<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 a462878..03769c8 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2017-05-01 15:36:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2017-05-01 15:36:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,31 +56,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,29 +56,27 @@
</span> SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,12 @@
</span> -ELSE()
- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
-ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Configure C++ standard if not externally specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# (will actually be set after CppUnit check below)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_CXX_STANDARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +32,49 @@
</span> - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-ELSE()
- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Configure C standard if not externally specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_C_STANDARD)
</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_STANDARD 99)
</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_STANDARD 99)
</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_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE()
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</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;'>++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c${CMAKE_C_STANDARD}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Set cmake policies.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # This will suppress developer warnings during the cmake process that can occur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if a newer cmake version than the minimum is used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,6 +299,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPUNIT_FOUND
</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 CppUnit version is 1.14.0 or greater; requires c++11 ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(CPPUNIT_FOUND AND NOT "${CPPUNIT_VERSION}" VERSION_LESS "1.14.0")
</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><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;'>++# set actual C++ standard to use, if cmake version is < 3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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++${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><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 volk as a subproject
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-CMakeLists.txt.release.diff b/science/gnuradio/files/patch-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5404534..3db3d73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2017-05-01 15:28:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2017-05-01 15:28:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,31 +56,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,29 +56,27 @@
</span> SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,12 @@
</span> -ELSE()
- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
-ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Configure C++ standard if not externally specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# (will actually be set after CppUnit check below)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_CXX_STANDARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(CMAKE_CXX_STANDARD 98)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +32,49 @@
</span> - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-ELSE()
- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Configure C standard if not externally specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_C_STANDARD)
</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_STANDARD 99)
</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_STANDARD 99)
</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_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE()
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</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;'>++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c${CMAKE_C_STANDARD}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Set cmake policies.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # This will suppress developer warnings during the cmake process that can occur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if a newer cmake version than the minimum is used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,6 +304,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPUNIT_FOUND
</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 CppUnit version is 1.14.0 or greater; requires c++11 ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(CPPUNIT_FOUND AND NOT "${CPPUNIT_VERSION}" VERSION_LESS "1.14.0")
</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><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;'>++# set actual C++ standard to use, if cmake version is < 3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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++${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><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;'>+ # Add optional dlls specified in DLL_PATHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-cmake_Modules_FindCppUnit.cmake.diff b/science/gnuradio/files/patch-cmake_Modules_FindCppUnit.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..67c0324
</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-cmake_Modules_FindCppUnit.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/Modules/FindCppUnit.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/Modules/FindCppUnit.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,3 +37,9 @@
</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(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MARK_AS_ADVANCED(CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set version to be useable by calling script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF(CPPUNIT_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CPPUNIT_VERSION ${PC_CPPUNIT_VERSION} CACHE INTERNAL "CppUnit Version" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENDIF()
</span></pre><pre style='margin:0'>
</pre>