From 616ce1394604d209b88b6a2d245868b3a3216337 Mon Sep 17 00:00:00 2001 From: Michael Dickens Date: Sat, 7 Mar 2015 11:07:38 -0500 Subject: cmake: for APPLE only, fix default values for CMAKE_INSTALL_NAME_DIR and CMAKE_INSTALL_RPATH. --- host/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index e2937edd3..6c35377c2 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) -- cgit v1.2.3 From 17b8f6cf6e6a0b812516ca0641cdac5425996fca Mon Sep 17 00:00:00 2001 From: Michael Dickens Date: Sat, 7 Mar 2015 11:04:58 -0500 Subject: e300: comment out unused variables in control::make when E300_NATIVE is not defined. --- host/lib/usrp/e300/e300_ublox_control_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); } -- cgit v1.2.3