summaryrefslogtreecommitdiffstats
path: root/host/lib
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-05-04 12:18:11 -0700
committerJosh Blum <josh@joshknows.com>2011-05-04 14:34:42 -0700
commit8426a72bd66850ed1311ee8957dc5b7e4d98e301 (patch)
tree4526c2cdd4eec056fe0917f1b1853d7d074e022c /host/lib
parent0ac4fe4e10093b1c7bd59af5c795b5a56d49e452 (diff)
downloaduhd-8426a72bd66850ed1311ee8957dc5b7e4d98e301.tar.gz
uhd-8426a72bd66850ed1311ee8957dc5b7e4d98e301.tar.bz2
uhd-8426a72bd66850ed1311ee8957dc5b7e4d98e301.zip
uhd: moved the logger into the utils subdir
Diffstat (limited to 'host/lib')
-rw-r--r--host/lib/CMakeLists.txt1
-rw-r--r--host/lib/utils/CMakeLists.txt1
-rw-r--r--host/lib/utils/log.cpp (renamed from host/lib/log.cpp)2
3 files changed, 2 insertions, 2 deletions
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>