diff options
| author | Andrew Lynch <andrew.lynch@ni.com> | 2018-03-26 15:01:11 -0500 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-03-28 14:07:20 -0700 |
| commit | 92a6c10979a2dea341349a44acbed43dc892dffc (patch) | |
| tree | 4ff0eff60e18bb96a2f4cf9d43efd5a2d86559bc | |
| parent | e333b72d926d97ffe6fdaa922e1a5c7289ec87f6 (diff) | |
| download | uhd-92a6c10979a2dea341349a44acbed43dc892dffc.tar.gz uhd-92a6c10979a2dea341349a44acbed43dc892dffc.tar.bz2 uhd-92a6c10979a2dea341349a44acbed43dc892dffc.zip | |
lib: Fixing config file path for some Windows builds
| -rw-r--r-- | host/include/config.h.in | 4 | ||||
| -rw-r--r-- | host/lib/utils/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | 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> |