cmake: remove unused includes option

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

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/cmake/BareosSetVariableDefaults.cmake b/cmake/BareosSetVariableDefaults.cmake
@@ -365,12 +365,6 @@ if(NOT client-only)
 endif()
 
 option(systemd "Enable systemd support" OFF)
-
-# includes TODO: used?
-if(NOT DEFINED includes)
-  set(includes ON)
-endif()
-
 option(openssl "Enable openssl support" ON)
 
 # ports
@@ -446,7 +440,7 @@ if(HAVE_WIN32)
     set(WINDOWS_BITS 64)
   endif()
 
-endif()
+endif() # HAVE_WIN32
 
 if(DEFINED do-static-code-checks)
   set(DO_STATIC_CODE_CHECKS ${do-static-code-checks})

diff --git a/core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile b/core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile
@@ -105,7 +105,6 @@ CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON \
   -Dopenssl=yes\
   -Dbasename="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
   -Dhostname="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
-  -Dincludes=yes\
   -Djansson=${LOCALBASE} \
   -Ddir-user=$(DIRECTOR_DAEMON_USER) \
   -Ddir-group=$(DAEMON_GROUP) \

diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -920,7 +920,6 @@ cmake  .. \
 %if 0%{?systemd_support}
   -Dsystemd=yes \
 %endif
-  -Dincludes=yes \
 %if !0%{?webui}
   -DENABLE_WEBUI=no \
 %endif

diff --git a/debian/rules b/debian/rules
@@ -56,7 +56,6 @@ define CONFIGURE_COMMON
   -Dmon-sd-password="XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX" \
   -Dbasename="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
   -Dhostname="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
-  -Dincludes=yes \
   -Drpath=no \
   -DVERSION_STRING=$(BAREOS_VERSION)
 endef