From 23ed1af481aa4a2901887a3127d42cf398fd40f5 Mon Sep 17 00:00:00 2001 From: Brooks Prumo Date: Fri, 15 Jan 2016 17:19:47 -0600 Subject: uhd: add CMake flag for the Windows registry key to specify UHD images directory --- host/lib/utils/paths.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'host/lib') diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index eb9e69a49..ebc18fe93 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -41,10 +41,6 @@ #include //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. @@ -287,8 +283,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` -- cgit v1.2.3