From 4c7cc6b1355a1ab7c8a60014061999f2338df1b1 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 10 Mar 2011 14:42:33 -0800
Subject: uhd: fixed include in safe call, added quotes for
 SET_SOURCE_FILES_PROPERTIES

---
 host/include/uhd/utils/safe_call.hpp | 2 +-
 host/lib/convert/CMakeLists.txt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/host/include/uhd/utils/safe_call.hpp b/host/include/uhd/utils/safe_call.hpp
index 6b2c210af..e23e508c8 100644
--- a/host/include/uhd/utils/safe_call.hpp
+++ b/host/include/uhd/utils/safe_call.hpp
@@ -19,7 +19,7 @@
 #define INCLUDED_UHD_UTILS_SAFE_CALL_HPP
 
 #include <uhd/config.hpp>
-#include <uhd/exception.hpp>
+#include <uhd/utils/exception.hpp>
 #include <uhd/utils/warning.hpp>
 
 //! helper macro for safe call to produce warnings
diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt
index abc9c2707..d189aa687 100644
--- a/host/lib/convert/CMakeLists.txt
+++ b/host/lib/convert/CMakeLists.txt
@@ -37,7 +37,7 @@ UNSET(CMAKE_REQUIRED_FLAGS)
 IF(HAVE_EMMINTRIN_H)
     SET_SOURCE_FILES_PROPERTIES(
         ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_sse2.cpp
-        PROPERTIES COMPILE_FLAGS ${EMMINTRIN_FLAGS}
+        PROPERTIES COMPILE_FLAGS "${EMMINTRIN_FLAGS}"
     )
     LIBUHD_APPEND_SOURCES(
         ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_sse2.cpp
-- 
cgit v1.2.3