From 92a6c10979a2dea341349a44acbed43dc892dffc Mon Sep 17 00:00:00 2001
From: Andrew Lynch <andrew.lynch@ni.com>
Date: Mon, 26 Mar 2018 15:01:11 -0500
Subject: lib: Fixing config file path for some Windows builds

---
 host/include/config.h.in      | 4 ++++
 host/lib/utils/CMakeLists.txt | 6 ------
 host/lib/utils/prefs.cpp      | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/host/include/config.h.in b/host/include/config.h.in
index e3a7fb0ca..c69673908 100644
--- a/host/include/config.h.in
+++ b/host/include/config.h.in
@@ -17,3 +17,7 @@
 #ifndef UHD_VERSION
 #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@
 #endif
+
+/* Config file path macros */
+#cmakedefine UHD_SYS_CONF_FILE "${UHD_SYS_CONF_FILE}"
+#cmakedefine UHD_USER_CONF_FILE "${UHD_USER_CONF_FILE}"
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt
index 0af642f90..f81e0763f 100644
--- a/host/lib/utils/CMakeLists.txt
+++ b/host/lib/utils/CMakeLists.txt
@@ -215,12 +215,6 @@ SET_SOURCE_FILES_PROPERTIES(
     "UHD_PKG_PATH=\"${UHD_PKG_PATH}\";UHD_LIB_DIR=\"${UHD_LIB_DIR}\""
 )
 
-SET_SOURCE_FILES_PROPERTIES(
-    ${CMAKE_CURRENT_SOURCE_DIR}/prefs.cpp
-    PROPERTIES COMPILE_DEFINITIONS
-    "UHD_SYS_CONF_FILE=\"${UHD_SYS_CONF_FILE}\";UHD_USER_CONF_FILE=\"${UHD_USER_CONF_FILE}\""
-)
-
 ########################################################################
 # Append sources
 ########################################################################
diff --git a/host/lib/utils/prefs.cpp b/host/lib/utils/prefs.cpp
index 5e5fa40f5..2ccc538fc 100644
--- a/host/lib/utils/prefs.cpp
+++ b/host/lib/utils/prefs.cpp
@@ -4,6 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0+
 //
 
+#include <config.h>
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/paths.hpp>
 #include <uhdlib/utils/prefs.hpp>
-- 
cgit v1.2.3