From 725dc29fa984d2db857eca2c6a8247f92bcc0c2d Mon Sep 17 00:00:00 2001 From: michael-west Date: Tue, 24 Sep 2019 17:38:26 -0700 Subject: MPM: Fix version string for logger Added configuration of version.cpp file so @UHD_VERSION@ would be properly replaced by the version string and @UHD_COMPONENT@ would be properly replaced by the component string. Signed-off-by: michael-west --- mpm/lib/catalina/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mpm/lib') diff --git a/mpm/lib/catalina/CMakeLists.txt b/mpm/lib/catalina/CMakeLists.txt index b003387ee..6f402f530 100644 --- a/mpm/lib/catalina/CMakeLists.txt +++ b/mpm/lib/catalina/CMakeLists.txt @@ -18,10 +18,17 @@ set (CMAKE_CATALINA_SOURCE_DIR ${UHD_HOST_ROOT}/lib/usrp/common ) +######################################################################## +# Setup UHD_VERSION and UHD_COMPONENT for version.cpp +######################################################################## configure_file( ${UHD_HOST_ROOT}/include/uhd/version.hpp.in ${CMAKE_BINARY_DIR}/include/uhd/version.hpp ) +configure_file( + ${UHD_HOST_ROOT}/lib/version.cpp + ${CMAKE_BINARY_DIR}/lib/version.cpp +) # TODO: Do something better than listing all the files individually set(catalina_sources @@ -34,7 +41,7 @@ set(catalina_sources ${UHD_HOST_ROOT}/lib/types/serial.cpp ${UHD_HOST_ROOT}/lib/property_tree.cpp ${UHD_HOST_ROOT}/lib/utils/log.cpp - ${UHD_HOST_ROOT}/lib/version.cpp + ${CMAKE_BINARY_DIR}/lib/version.cpp ) USRP_PERIPHS_ADD_OBJECT(catalina ${catalina_sources}) -- cgit v1.2.3