diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-10 14:44:56 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-10 14:44:56 -0800 |
| commit | fd35b0fdfd7012e3c37499f2bbcde6540c604a09 (patch) | |
| tree | 8c8c9da0be31ffd12acdbe3d92c5f7495e6a579a | |
| parent | 09149bbf7d28f67e68d65f7ba153ccd31ae48e5b (diff) | |
| parent | 4c7cc6b1355a1ab7c8a60014061999f2338df1b1 (diff) | |
| download | uhd-fd35b0fdfd7012e3c37499f2bbcde6540c604a09.tar.gz uhd-fd35b0fdfd7012e3c37499f2bbcde6540c604a09.tar.bz2 uhd-fd35b0fdfd7012e3c37499f2bbcde6540c604a09.zip | |
Merge branch 'master' into next
| -rw-r--r-- | host/include/uhd/utils/safe_call.hpp | 2 | ||||
| -rw-r--r-- | 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 |