diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-19 16:58:12 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-19 16:58:12 -0700 |
| commit | 00bc8d50d5a2528704441ef5532fea13106a8d30 (patch) | |
| tree | 0803774f3d0d73ab1be97aecb39f2e3996fe5e19 /host/lib/utils | |
| parent | 06e10b5f469b8b06af33a8a95a6302a1e365b396 (diff) | |
| download | uhd-00bc8d50d5a2528704441ef5532fea13106a8d30.tar.gz uhd-00bc8d50d5a2528704441ef5532fea13106a8d30.tar.bz2 uhd-00bc8d50d5a2528704441ef5532fea13106a8d30.zip | |
uhd: removed constants.hpp.in, replaced w/ per source compile defines
Diffstat (limited to 'host/lib/utils')
| -rw-r--r-- | host/lib/utils/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | host/lib/utils/paths.cpp | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt index 26c02b5b4..1314f7475 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt @@ -112,6 +112,19 @@ SET_SOURCE_FILES_PROPERTIES( ) ######################################################################## +# Define UHD_PKG_DATA_PATH for paths.cpp +######################################################################## +FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${PKG_DATA_DIR} UHD_PKG_DATA_PATH) +STRING(REPLACE "\\" "\\\\" UHD_PKG_DATA_PATH ${UHD_PKG_DATA_PATH}) +MESSAGE(STATUS "Full package data directory: ${UHD_PKG_DATA_PATH}") + +SET_SOURCE_FILES_PROPERTIES( + ${CMAKE_CURRENT_SOURCE_DIR}/paths.cpp + PROPERTIES COMPILE_DEFINITIONS + "UHD_PKG_DATA_PATH=\"${UHD_PKG_DATA_PATH}\"" +) + +######################################################################## # Append sources ######################################################################## LIBUHD_APPEND_SOURCES( diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index a0e4da547..a3dd377e5 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -15,7 +15,6 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#include "constants.hpp" #include <uhd/config.hpp> #include <boost/tokenizer.hpp> #include <boost/filesystem.hpp> |