diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-01-21 20:49:28 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-01-21 20:49:28 +0100 |
| commit | 17712af3b8f1f4cc1bdd11f0f4377c79cb6da87b (patch) | |
| tree | be6fed1a127de3d4e290ca6ad41196f9d43cc6dd /host/lib | |
| parent | 79c20e228dc05d1e0cfa1472f72bf31906213350 (diff) | |
| parent | 23ed1af481aa4a2901887a3127d42cf398fd40f5 (diff) | |
| download | uhd-17712af3b8f1f4cc1bdd11f0f4377c79cb6da87b.tar.gz uhd-17712af3b8f1f4cc1bdd11f0f4377c79cb6da87b.tar.bz2 uhd-17712af3b8f1f4cc1bdd11f0f4377c79cb6da87b.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/utils/paths.cpp | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/host/lib/usrp/common/CMakeLists.txt b/host/lib/usrp/common/CMakeLists.txt index 27de9c061..270314dcc 100644 --- a/host/lib/usrp/common/CMakeLists.txt +++ b/host/lib/usrp/common/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2011-2013 Ettus Research LLC +# Copyright 2011-2013,2016 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,8 +19,6 @@ # This file included, use CMake directory variables ######################################################################## IF(ENABLE_USB) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../firmware/fx2/common) - LIBUHD_APPEND_SOURCES( ${CMAKE_CURRENT_SOURCE_DIR}/fx2_ctrl.cpp ) diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index 5aa505baf..8f586ddf4 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -40,10 +40,6 @@ #include <windows.h> //GetTempPath #endif -#ifdef USE_NIUSRP_WINREG_KEY -#define NIUSRP_WINREG_KEY "[HKLM\\Software\\National Instruments\\NI-USRP\\DriverBitfilesDir]" -#endif - namespace fs = boost::filesystem; /*! Get the value of an environment variable. @@ -286,8 +282,8 @@ std::string uhd::get_images_dir(const std::string &search_paths) { * (see below). Making a local copy for const correctness. */ std::string _search_paths = search_paths; -#ifdef USE_NIUSRP_WINREG_KEY - _search_paths = std::string(NIUSRP_WINREG_KEY) + "," + search_paths; +#ifdef UHD_IMAGES_DIR_WINREG_KEY + _search_paths = std::string("UHD_IMAGES_DIR_WINREG_KEY") + "," + search_paths; #endif /* Now we will parse and attempt to qualify the paths in the `search_paths` |