core: move PLUGINS settings to src/filed/CMakeFile

core/CMakeLists.txt

@@ -678,19 +678,6 @@ if(${lmdb})
 endif()
 
 # info what the config files need to be installed PLUGINS  ############
-set(PLUGINS python-ldap-conf.d)
-list(APPEND PLUGINS python-ovirt-conf.d)
-
-if(${HAVE_CEPHFS})
-  list(APPEND PLUGINS cephfs-conf.d)
-endif()
-if(${HAVE_CEPH_RADOS})
-  list(APPEND PLUGINS rados-conf.d)
-endif()
-
-if(${HAVE_GLUSTERFS})
-  list(APPEND PLUGINS gfapi-conf.d)
-endif()
 
 set(support_systemd "")
 set(batch_insert_db_backends "")

core/src/dird/CMakeLists.txt

@@ -174,18 +174,12 @@ target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES})
 # add_executable(testfind ${TSTFNDSRCS}) target_link_libraries(testfind bareos
 # bareosfind jansson ${OPENSSL_LIBS} acl cap lzo2 )
 
-install(TARGETS
-  bareos-dir
-  bareos-dbcheck
-  DESTINATION "${sbindir}"
-)
+install(TARGETS bareos-dir bareos-dbcheck DESTINATION "${sbindir}")
 
 install(FILES query.sql DESTINATION "${scriptdir}")
 
-install(CODE "set(PLUGINS \"${PLUGINS}\")")
 install(CODE "set(BACKENDS \"${BACKENDS}\")")
 install(CODE "set(configtemplatedir \"${configtemplatedir}\")")
 install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
 
 install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-dird-configfiles.cmake)
-

core/src/filed/CMakeLists.txt

@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2020 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -51,8 +51,8 @@ set(FDSRCS
 
 if(HAVE_WIN32)
   list(APPEND FDSRCS ../win32/filed/vss.cc ../win32/filed/vss_XP.cc
-              ../win32/filed/vss_W2K3.cc ../win32/filed/vss_Vista.cc
-              ../win32/generic/service.cc ../win32/generic/main.cc
+       ../win32/filed/vss_W2K3.cc ../win32/filed/vss_Vista.cc
+       ../win32/generic/service.cc ../win32/generic/main.cc
   )
 endif()
 
@@ -90,7 +90,25 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   )
 endif()
 
-install(TARGETS bareos-fd DESTINATION "${sbindir}" COMPONENT filedaemon)
+set(PLUGINS python-ldap-conf.d)
+list(APPEND PLUGINS python-ovirt-conf.d)
+
+if(${HAVE_CEPHFS})
+  list(APPEND PLUGINS cephfs-conf.d)
+endif()
+if(${HAVE_CEPH_RADOS})
+  list(APPEND PLUGINS rados-conf.d)
+endif()
+
+if(${HAVE_GLUSTERFS})
+  list(APPEND PLUGINS gfapi-conf.d)
+endif()
+
+install(
+  TARGETS bareos-fd
+  DESTINATION "${sbindir}"
+  COMPONENT filedaemon
+)
 
 install(CODE "set(PLUGINS \"${PLUGINS}\")" COMPONENT filedaemon)
 install(CODE "set(BACKENDS \"${BACKENDS}\")" COMPONENT filedaemon)