cmake: cleanup traymonitor variables

bareos · Jan 30, 2024 · fbcd7f0 · fbcd7f0
1 parent d74b6b1
commit fbcd7f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,7 +105,7 @@ if(docs-build-json)
   if(NOT traymonitor)
     message(
       FATAL_ERROR
-        "\n\"docs-build-json\" needs the traymonitor executable: add \"-Dtraymonitor=yes\""
+        "\n\"docs-build-json\" needs the traymonitor executable: add \"-Dtraymonitor=on\""
     )
   endif()
 endif()

diff --git a/cmake/BareosSetVariableDefaults.cmake b/cmake/BareosSetVariableDefaults.cmake
@@ -333,8 +333,8 @@ option(lmdb "Enable LMDP" ON)
 option(ndmp "Enable NDMP support" ON)
 option(acl "Enable ACL support" ON)
 option(xattr "Enable extended file attributes (xattr) support" ON)
-option(build_ndmjob "Enable building ndmpjob" OFF)
-option(traymonitor "Enable building the bareos-traymonitor" OFF)
+option(build_ndmjob "Building ndmpjob" OFF)
+option(traymonitor "Build bareos-traymonitor" OFF)
 
 option(client-only "Build only the client components" OFF)
 if(client-only)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -878,7 +878,7 @@ message(
 message("   LMDB support:                 ${lmdb} ")
 message("   NDMP support:                 ${ndmp} ")
 message("   Build ndmjob binary:          ${build_ndmjob} ")
-message("   tray-monitor support:         ${HAVE_TRAYMONITOR} ")
+message("   Build tray-monitor:           ${traymonitor} ")
 message("   webui:                        ${ENABLE_WEBUI} ")
 message("   client-only:                  ${build_client_only} ")
 message("   Plugin support:               ${have_plugins} ")

diff --git a/core/cmake/BareosGenerateDebianInfo.cmake b/core/cmake/BareosGenerateDebianInfo.cmake
@@ -75,7 +75,7 @@ else()
     list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-storage-python-plugins-common")
   endif()
 
-  if(TRAYMONITOR)
+  if(traymonitor)
     list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-traymonitor")
   endif()