NDMP: set vendor, product and revision information

Before, the defaults coming from the NDMP library were set.
bareos · Dec 19, 2018 · 62f5adc · 62f5adc
1 parent 0fe91c0
commit 62f5adc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/core/cmake/BareosExtractVersionInfo.cmake b/core/cmake/BareosExtractVersionInfo.cmake
@@ -22,6 +22,7 @@
 file(STRINGS ${CMAKE_SOURCE_DIR}/src/include/version.h VERSION_INFO REGEX define.*VERSION.*)
 string(REGEX MATCH [0-9.]+ VERSION ${VERSION_INFO})
 string(REGEX MATCH [0-9]+ SOVERSION ${VERSION_INFO})
+string(REGEX MATCH \".*\" FULLVERSION ${VERSION_INFO})
 
 # extract date from version.h
 file(STRINGS ${CMAKE_SOURCE_DIR}/src/include/version.h DATE_INFO REGEX define.*BDATE.*)

diff --git a/core/src/ndmp/CMakeLists.txt b/core/src/ndmp/CMakeLists.txt
@@ -19,6 +19,10 @@
 
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_OPTION_NO_TEST_AGENTS")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_NDMJOBLIB_REVISION=\\\"${FULLVERSION}\\\"")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_VENDOR_NAME=\\\"Bareos\\ GmbH\\ \\&\\ Co.KG\\\"")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_PRODUCT_NAME=\\\"Bareos\\\"")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_PRODUCT_REVISION=\\\"${FULLVERSION}\\\"")
 
 if (${HAVE_LINUX_OS})
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_LINUX_OS")