all source tree: apply cmake-format to all files

bareos · Jan 24, 2020 · 01b96b3 · 01b96b3
1 parent a0b61bb
commit 01b96b3
Show file tree

Hide file tree

Showing 14 changed files with 121 additions and 158 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -694,8 +694,7 @@ if(${lmdb})
   set(LMDB_LIBS bareoslmdb)
 endif()
 
-# info what the config files need to be installed
-#####  PLUGINS  ############
+# info what the config files need to be installed PLUGINS  ############
 set(PLUGINS python-ldap-conf.d)
 list(APPEND PLUGINS python-ovirt-conf.d)
 
@@ -929,8 +928,6 @@ message("   HAVE_IS_TRIVIALLY_COPYABLE:   ${HAVE_IS_TRIVIALLY_COPYABLE}")
 
 message("   do-static-code-checks:        ${DO_STATIC_CODE_CHECKS}")
 
-
-
 if(DO_STATIC_CODE_CHECKS)
   message("    static code check tools:")
   message(

diff --git a/core/src/cats/CMakeLists.txt b/core/src/cats/CMakeLists.txt
@@ -45,9 +45,8 @@ set(POSTGRESQL_SRCS postgresql.cc ${LIBBAREOSCATS_SRCS})
 add_library(bareossql SHARED ${LIBBAREOSSQL_SRCS})
 
 set_target_properties(
-  bareossql
-  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                                                 "${BAREOS_VERSION_MAJOR}"
+  bareossql PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                       "${BAREOS_VERSION_MAJOR}"
 )
 target_link_libraries(bareossql bareoscats bareos)
 
@@ -61,9 +60,8 @@ list(LENGTH db_backends nr_db_backends)
 add_library(bareoscats SHARED ${LIBBAREOSCATS_SRCS})
 target_link_libraries(bareoscats bareos)
 set_target_properties(
-  bareoscats
-  PROPERTIES VERSION ${BAREOS_NUMERIC_VERSION} SOVERSION
-                                               "${BAREOS_VERSION_MAJOR}"
+  bareoscats PROPERTIES VERSION ${BAREOS_NUMERIC_VERSION} SOVERSION
+                        "${BAREOS_VERSION_MAJOR}"
 )
 install(TARGETS bareoscats DESTINATION ${libdir})
 

diff --git a/core/src/console/CMakeLists.txt b/core/src/console/CMakeLists.txt
@@ -45,16 +45,8 @@ endif()
 
 target_link_libraries(bconsole ${CONSOLE_LINK_LIBRARIES})
 
-install(
-  TARGETS bconsole
-  DESTINATION "${bindir}"
-  COMPONENT bconsole
-)
-install(
-  TARGETS bconsole
-  DESTINATION "${sbindir}"
-  COMPONENT bconsole
-)
+install(TARGETS bconsole DESTINATION "${bindir}" COMPONENT bconsole)
+install(TARGETS bconsole DESTINATION "${sbindir}" COMPONENT bconsole)
 install(
   FILES bconsole.conf
   DESTINATION "${configtemplatedir}"

diff --git a/core/src/fastlz/CMakeLists.txt b/core/src/fastlz/CMakeLists.txt
@@ -31,7 +31,6 @@ target_include_directories(
 target_compile_definitions(bareosfastlz PRIVATE "-DDLL_EXPORT")
 install(TARGETS bareosfastlz DESTINATION ${libdir})
 set_target_properties(
-  bareosfastlz
-  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                                                 "${BAREOS_VERSION_MAJOR}"
+  bareosfastlz PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                          "${BAREOS_VERSION_MAJOR}"
 )
diff --git a/core/src/filed/CMakeLists.txt b/core/src/filed/CMakeLists.txt
@@ -89,11 +89,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   )
 endif()
 
-install(
-  TARGETS bareos-fd
-  DESTINATION "${sbindir}"
-  COMPONENT filedaemon
-)
+install(TARGETS bareos-fd DESTINATION "${sbindir}" COMPONENT filedaemon)
 
 install(CODE "set(PLUGINS \"${PLUGINS}\")" COMPONENT filedaemon)
 install(CODE "set(BACKENDS \"${BACKENDS}\")" COMPONENT filedaemon)

diff --git a/core/src/findlib/CMakeLists.txt b/core/src/findlib/CMakeLists.txt
@@ -44,17 +44,11 @@ add_library(bareosfind SHARED ${BAREOSFIND_SRCS})
 
 target_link_libraries(bareosfind bareos ${ACL_LIBS})
 
-install(
-  TARGETS bareosfind
-  DESTINATION ${libdir}
-  COMPONENT filedaemon
-)
+install(TARGETS bareosfind DESTINATION ${libdir} COMPONENT filedaemon)
 
 set_target_properties(
-  bareosfind
-  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}"
-             SOVERSION "${BAREOS_VERSION_MAJOR}"
-             DEFINE_SYMBOL "BUILDING_DLL"
+  bareosfind PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                        "${BAREOS_VERSION_MAJOR}" DEFINE_SYMBOL "BUILDING_DLL"
 )
 if(HAVE_WIN32)
   set_target_properties(bareosfind PROPERTIES DEFINE_SYMBOL "BUILDING_DLL")

diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -228,9 +228,8 @@ target_link_libraries(
 install(TARGETS bareos DESTINATION ${libdir})
 
 set_target_properties(
-  bareos
-  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                                                 "${BAREOS_VERSION_MAJOR}"
+  bareos PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                    "${BAREOS_VERSION_MAJOR}"
 )
 
 if(HAVE_WIN32)

diff --git a/core/src/lmdb/CMakeLists.txt b/core/src/lmdb/CMakeLists.txt
@@ -27,9 +27,8 @@ add_library(bareoslmdb SHARED mdb.c midl.c)
 set_property(TARGET bareoslmdb PROPERTY INCLUDE_DIRECTORIES "")
 
 set_target_properties(
-  bareoslmdb
-  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                                                 "${BAREOS_VERSION_MAJOR}"
+  bareoslmdb PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                        "${BAREOS_VERSION_MAJOR}"
 )
 if(HAVE_WIN32)
   set_target_properties(bareoslmdb PROPERTIES DEFINE_SYMBOL "BUILDING_DLL")

diff --git a/core/src/ndmp/CMakeLists.txt b/core/src/ndmp/CMakeLists.txt
@@ -187,9 +187,8 @@ target_link_libraries(bareosndmp ${WRAP_LIBS} ${TIRPC_LIBRARIES})
 install(TARGETS bareosndmp DESTINATION ${libdir})
 
 set_target_properties(
-  bareosndmp
-  PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
-                                                 "${BAREOS_VERSION_MAJOR}"
+  bareosndmp PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}" SOVERSION
+                        "${BAREOS_VERSION_MAJOR}"
 )
 if(build_ndmjob)
   add_executable(ndmjob ${NDMJOB_SRCS})

diff --git a/core/src/plugins/filed/CMakeLists.txt b/core/src/plugins/filed/CMakeLists.txt
@@ -46,11 +46,7 @@ include_directories(${OPENSSL_INCLUDE_DIR})
 
 add_library(bpipe-fd MODULE bpipe-fd.cc)
 set_target_properties(bpipe-fd PROPERTIES PREFIX "")
-install(
-  TARGETS bpipe-fd
-  DESTINATION ${plugindir}
-  COMPONENT filedaemon
-)
+install(TARGETS bpipe-fd DESTINATION ${plugindir} COMPONENT filedaemon)
 if(HAVE_WIN32 OR HAVE_DARWIN_OS)
   target_link_libraries(bpipe-fd bareos)
 endif()
@@ -62,32 +58,20 @@ if(HAVE_WIN32)
     mssqlvdi-fd PROPERTIES PREFIX "" DEFINE_SYMBOL "BUILDING_DLL"
   )
 
-  install(
-    TARGETS mssqlvdi-fd
-    DESTINATION ${plugindir}
-    COMPONENT filedaemon
-  )
+  install(TARGETS mssqlvdi-fd DESTINATION ${plugindir} COMPONENT filedaemon)
   target_link_libraries(mssqlvdi-fd bareos)
 endif()
 
 if(${HAVE_CEPHFS})
   add_library(cephfs-fd MODULE cephfs-fd.cc)
   set_target_properties(cephfs-fd PROPERTIES PREFIX "")
-  install(
-    TARGETS cephfs-fd
-    DESTINATION ${plugindir}
-    COMPONENT filedaemon
-  )
+  install(TARGETS cephfs-fd DESTINATION ${plugindir} COMPONENT filedaemon)
 endif()
 
 if(${HAVE_CEPH_RADOS})
   add_library(rados-fd MODULE rados-fd.cc)
   set_target_properties(rados-fd PROPERTIES PREFIX "")
-  install(
-    TARGETS rados-fd
-    DESTINATION ${plugindir}
-    COMPONENT filedaemon
-  )
+  install(TARGETS rados-fd DESTINATION ${plugindir} COMPONENT filedaemon)
 endif()
 
 if(NOT HAVE_WIN32)
@@ -98,34 +82,22 @@ endif()
 if(HAVE_PYTHON)
   add_library(python-fd MODULE python-fd.cc)
   set_target_properties(python-fd PROPERTIES PREFIX "")
-  install(
-    TARGETS python-fd
-    DESTINATION ${plugindir}
-    COMPONENT filedaemon
-  )
+  install(TARGETS python-fd DESTINATION ${plugindir} COMPONENT filedaemon)
   target_link_libraries(python-fd ${PYTHON_LIBRARIES} bareos)
 endif()
 
 if(${HAVE_GLUSTERFS})
   add_library(gfapi-fd MODULE gfapi-fd.cc)
   set_target_properties(gfapi-fd PROPERTIES PREFIX "")
-  install(
-    TARGETS gfapi-fd
-    DESTINATION ${plugindir}
-    COMPONENT filedaemon
-  )
+  install(TARGETS gfapi-fd DESTINATION ${plugindir} COMPONENT filedaemon)
   target_link_libraries(gfapi-fd gfapi)
 endif()
 
 if(${HAVE_TEST_PLUGIN})
   add_library(test-plugin-fd MODULE test-plugin-fd.cc)
   # do not prefix with "lib"
   set_target_properties(test-plugin-fd PROPERTIES PREFIX "")
-  install(
-    TARGETS test-plugin-fd
-    DESTINATION ${plugindir}
-    COMPONENT filedaemon
-  )
+  install(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon)
 endif()
 
 set(PYFILES
@@ -136,16 +108,13 @@ set(PYFILES
     BareosFdPluginLocalFileset.py
     BareosFdWrapper.py
     bareos_fd_consts.py
-
     bareos-fd-ldap.py
     BareosFdPluginLDAP.py
-
     bareos-fd-ovirt.py
     BareosFdPluginOvirt.py
-
     bareos-fd-percona-xtrabackup.py
     BareosFdPluginPerconaXtraBackup.py
-    )
+)
 
 install(
   FILES ${PYFILES}

diff --git a/core/src/stored/CMakeLists.txt b/core/src/stored/CMakeLists.txt
@@ -233,8 +233,8 @@ target_link_libraries(bcopy bareossd bareos)
 
 install(TARGETS bareossd DESTINATION ${libdir})
 
-install(TARGETS bareos-sd bls bextract bscan btape bcopy
-        DESTINATION "${sbindir}"
+install(TARGETS bareos-sd bls bextract bscan btape bcopy DESTINATION
+                "${sbindir}"
 )
 
 install(CODE "set(PLUGINS \"${PLUGINS}\")")

diff --git a/core/src/tests/CMakeLists.txt b/core/src/tests/CMakeLists.txt
@@ -386,10 +386,9 @@ if(NOT HAVE_WIN32 AND NOT client-only)
   )
 endif() # NOT HAVE_WIN32 AND NOT client-only
 
-
 if(NOT client-only)
   bareos_add_test(
     sort_stringvector LINK_LIBRARIES bareos ${GTEST_LIBRARIES}
                                      ${GTEST_MAIN_LIBRARIES}
-)
+  )
 endif() # NOT client-only
diff --git a/docs/manuals/CMakeLists.txt b/docs/manuals/CMakeLists.txt
@@ -134,8 +134,7 @@ endif()
 
 # target: docs ######
 add_custom_target(
-  docs
-  ${DOCS_ALL}
+  docs ${DOCS_ALL}
   COMMAND ${SPHINX_COMMAND} -M html "${SPHINX_SOURCE_DIR}" "${SPHINX_BUILDDIR}"
           "${SPHINX_OPTS}"
   DEPENDS $<$<BOOL:${docs-build-json}>:clean-docs>