diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-08-12 10:30:53 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-12 10:30:53 -0700 |
| commit | 0d7c9c86aa3b307b652378d3bb17e052cbc987e1 (patch) | |
| tree | 5d5b72467daa93674fa322c9588a1240f01c78ba /host/lib/constants.hpp.in | |
| parent | 32c40b5f5956d29e3be1fc3c94a213f8f0d68f42 (diff) | |
| parent | ef6953024f1075a729e85f2511c75de337879888 (diff) | |
| download | uhd-0d7c9c86aa3b307b652378d3bb17e052cbc987e1.tar.gz uhd-0d7c9c86aa3b307b652378d3bb17e052cbc987e1.tar.bz2 uhd-0d7c9c86aa3b307b652378d3bb17e052cbc987e1.zip | |
Merge branch 'master' of git@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, 4 insertions, 3 deletions
diff --git a/host/lib/constants.hpp.in b/host/lib/constants.hpp.in index 295c8f16c..aa51e558c 100644 --- a/host/lib/constants.hpp.in +++ b/host/lib/constants.hpp.in @@ -21,8 +21,9 @@ #include <uhd/config.hpp> #include <string> -static const std::string UHD_VERSION_STRING = "@CPACK_PACKAGE_VERSION@"; -static const std::string UHD_INSTALL_PREFIX = "@CMAKE_INSTALL_PREFIX@"; -static const std::string UHD_PKG_DATA_DIR = "@PKG_DATA_DIR@"; +//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@" #endif /* INCLUDED_LIBUHD_CONSTANTS_HPP */ |