uhd: moved the logger into the utils subdir

6 files changed, 10 insertions, 6 deletions

diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt
index dca32089e..74dc4a7d6 100644
--- a/host/include/uhd/CMakeLists.txt
+++ b/host/include/uhd/CMakeLists.txt
@@ -26,7 +26,6 @@ INSTALL(FILES
     convert.hpp
     device.hpp
     exception.hpp
-    log.hpp
     version.hpp
     wax.hpp
     DESTINATION ${INCLUDE_DIR}/uhd
diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt
index 71808ac98..6c507dcde 100644
--- a/host/include/uhd/utils/CMakeLists.txt
+++ b/host/include/uhd/utils/CMakeLists.txt
@@ -23,6 +23,7 @@ INSTALL(FILES
     byteswap.ipp
     gain_group.hpp
     images.hpp
+    log.hpp
     pimpl.hpp
     props.hpp
     safe_call.hpp
diff --git a/host/include/uhd/log.hpp b/host/include/uhd/utils/log.hpp
index ff9dfe239..75c335099 100644
--- a/host/include/uhd/log.hpp
+++ b/host/include/uhd/utils/log.hpp
@@ -15,8 +15,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_UHD_LOG_HPP
-#define INCLUDED_UHD_LOG_HPP
+#ifndef INCLUDED_UHD_UTILS_LOG_HPP
+#define INCLUDED_UHD_UTILS_LOG_HPP
 
 #include <uhd/config.hpp>
 #include <boost/current_function.hpp>
@@ -30,6 +30,10 @@
  * Log entries are time-stamped and stored with file, line, and function.
  * Each call to the UHD_LOG macros is synchronous and thread-safe.
  *
+ * The log file can be found in the path <temp-directory>/uhd.log,
+ * where <temp-directory> is the user or system's temporary directory.
+ * To override <temp-directory>, set the UHD_TEMP_PATH environment variable.
+ *
  * All log messages with verbosity greater than or equal to the log level
  * are recorded into the log file. All other messages are sent to null.
  *
@@ -88,4 +92,4 @@ namespace uhd{ namespace _log{
 
 }} //namespace uhd::_log
 
-#endif /* INCLUDED_UHD_LOG_HPP */
+#endif /* INCLUDED_UHD_UTILS_LOG_HPP */
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 03b79c036..fca4730d8 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -93,7 +93,6 @@ SET_SOURCE_FILES_PROPERTIES(
 LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/exception.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wax.cpp
 )
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt
index 1314f7475..ae18bde9d 100644
--- a/host/lib/utils/CMakeLists.txt
+++ b/host/lib/utils/CMakeLists.txt
@@ -131,6 +131,7 @@ LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_SOURCE_DIR}/gain_group.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/images.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/load_modules.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/paths.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/props.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/static.cpp
diff --git a/host/lib/log.cpp b/host/lib/utils/log.cpp
index c0c51d9a6..605704874 100644
--- a/host/lib/log.cpp
+++ b/host/lib/utils/log.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/log.hpp>
+#include <uhd/utils/log.hpp>
 #include <uhd/utils/static.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>