diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:48:35 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:48:35 -0700 |
| commit | 2da87fa5082c507d324dce743d63667a6d21fd80 (patch) | |
| tree | ead6d4b7e9af0a403d6079134f9fa992dc52102c /host/lib/constants.hpp.in | |
| parent | 40faee2e6d87f7364a0c0c2cf310f1483c0331cf (diff) | |
| parent | 8740197dfed997bb235b73ec649edb803d544326 (diff) | |
| download | uhd-2da87fa5082c507d324dce743d63667a6d21fd80.tar.gz uhd-2da87fa5082c507d324dce743d63667a6d21fd80.tar.bz2 uhd-2da87fa5082c507d324dce743d63667a6d21fd80.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Diffstat (limited to 'host/lib/constants.hpp.in')
| -rw-r--r-- | host/lib/constants.hpp.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/host/lib/constants.hpp.in b/host/lib/constants.hpp.in index aa51e558c..4aedb6d4a 100644 --- a/host/lib/constants.hpp.in +++ b/host/lib/constants.hpp.in @@ -18,12 +18,9 @@ #ifndef INCLUDED_LIBUHD_CONSTANTS_HPP #define INCLUDED_LIBUHD_CONSTANTS_HPP -#include <uhd/config.hpp> -#include <string> - //these should be pre-processor macros to avoid static initialization issues #define UHD_VERSION_STRING "@CPACK_PACKAGE_VERSION@" -#define UHD_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" -#define UHD_PKG_DATA_DIR "@PKG_DATA_DIR@" +#define LOCAL_PKG_DATA_DIR "@LOCAL_PKG_DATA_DIR@" +#define INSTALLER_PKG_DATA_DIR "@INSTALLER_PKG_DATA_DIR@" #endif /* INCLUDED_LIBUHD_CONSTANTS_HPP */ |