Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p

Conflicts:
	host/lib/ic_reg_maps/CMakeLists.txt
	host/lib/usrp/usrp2/io_impl.cpp

1 files changed, 14 insertions, 0 deletions

diff --git a/host/lib/version.cpp b/host/lib/version.cpp
index 5edbca09b..93fdecb1a 100644
--- a/host/lib/version.cpp
+++ b/host/lib/version.cpp
@@ -21,3 +21,17 @@
 std::string uhd::get_version_string(void){
     return UHD_VERSION_STRING;
 }
+
+#include <uhd/utils/static.hpp>
+#include <boost/version.hpp>
+#include <iostream>
+
+UHD_STATIC_BLOCK(print_system_info){
+    std::cout
+        << BOOST_PLATFORM << "; "
+        << BOOST_COMPILER << "; "
+        << "Boost_" << BOOST_VERSION << "; "
+        << "UHD_" << uhd::get_version_string()
+        << std::endl << std::endl
+    ;
+}