diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-09 16:29:06 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-09 16:29:06 -0700 |
| commit | c646177e54fed77a9508369ed3f7fc20f1d88a8f (patch) | |
| tree | 7139f179731c704861046ebe087ebcafeeda1c0b | |
| parent | d9241b78d32402093c37ab7ce2f4336699219ed4 (diff) | |
| parent | 17b8f6cf6e6a0b812516ca0641cdac5425996fca (diff) | |
| download | uhd-c646177e54fed77a9508369ed3f7fc20f1d88a8f.tar.gz uhd-c646177e54fed77a9508369ed3f7fc20f1d88a8f.tar.bz2 uhd-c646177e54fed77a9508369ed3f7fc20f1d88a8f.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_ublox_control_impl.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 2d3cdcfbd..0c168e09b 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -99,12 +99,12 @@ ENDIF(ENABLE_STATIC_LIBS) IF(APPLE) IF(NOT CMAKE_INSTALL_NAME_DIR) SET(CMAKE_INSTALL_NAME_DIR - ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE + ${CMAKE_INSTALL_PREFIX}/${LIBRARY_DIR} CACHE PATH "Library Install Name Destination Directory" FORCE) ENDIF(NOT CMAKE_INSTALL_NAME_DIR) IF(NOT CMAKE_INSTALL_RPATH) SET(CMAKE_INSTALL_RPATH - ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE + ${CMAKE_INSTALL_PREFIX}/${LIBRARY_DIR} CACHE PATH "Library Install RPath" FORCE) ENDIF(NOT CMAKE_INSTALL_RPATH) IF(NOT CMAKE_BUILD_WITH_INSTALL_RPATH) diff --git a/host/lib/usrp/e300/e300_ublox_control_impl.cpp b/host/lib/usrp/e300/e300_ublox_control_impl.cpp index a0ec10271..0f56fdb67 100644 --- a/host/lib/usrp/e300/e300_ublox_control_impl.cpp +++ b/host/lib/usrp/e300/e300_ublox_control_impl.cpp @@ -498,7 +498,7 @@ control::sptr control::make(const std::string &node, const size_t baud_rate) #else using namespace uhd::usrp::gps::ublox::ubx; -control::sptr control::make(const std::string &node, const size_t baud_rate) +control::sptr control::make(const std::string& /* node */, const size_t /* baud_rate */) { throw uhd::assertion_error("control::sptr::make: !E300_NATIVE"); } |