aboutsummaryrefslogtreecommitdiffstats
path: root/mpm
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2019-09-24 17:38:26 -0700
committerMartin Braun <martin.braun@ettus.com>2019-10-15 15:21:52 -0700
commit725dc29fa984d2db857eca2c6a8247f92bcc0c2d (patch)
treeae854081f0701534def9e7a9620ff5bca01eee89 /mpm
parent1004eef88e1a695cc0a2f3002bd8aa8b5d22e0e8 (diff)
downloaduhd-725dc29fa984d2db857eca2c6a8247f92bcc0c2d.tar.gz
uhd-725dc29fa984d2db857eca2c6a8247f92bcc0c2d.tar.bz2
uhd-725dc29fa984d2db857eca2c6a8247f92bcc0c2d.zip
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 <michael.west@ettus.com>
Diffstat (limited to 'mpm')
-rw-r--r--mpm/lib/catalina/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
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})