Skip to content

Commit

Permalink
format: apply bareos-check-sources modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
pstorz committed Sep 10, 2022
1 parent 5547b14 commit 9916659
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
1 change: 0 additions & 1 deletion .matrix.yml
Expand Up @@ -444,4 +444,3 @@ OS:
WINVERSIONS:
- windows-10-32
- windows-10-64

6 changes: 4 additions & 2 deletions core/CMakeLists.txt
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
# Copyright (C) 2017-2021 Bareos GmbH & Co. KG
# Copyright (C) 2017-2022 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
Expand Down Expand Up @@ -262,7 +262,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
include_directories(/usr/local/include)
link_directories(/usr/local/lib)
link_libraries(intl)
check_cxx_compiler_flag(-Wunused-but-set-variable compiler_will_warn_of_unused_but_set_variable)
check_cxx_compiler_flag(
-Wunused-but-set-variable compiler_will_warn_of_unused_but_set_variable
)
endif()

if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
Expand Down
13 changes: 5 additions & 8 deletions core/src/dird/CMakeLists.txt
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
# Copyright (C) 2017-2020 Bareos GmbH & Co. KG
# Copyright (C) 2017-2022 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
Expand Down Expand Up @@ -119,7 +119,9 @@ set(DBCHKSRCS dbcheck.cc dird_conf.cc dird_globals.cc ua_acl.cc ua_audit.cc
)

if(compiler_will_warn_of_unused_but_set_variable)
set_source_files_properties(catreq.cc PROPERTIES COMPILE_FLAGS -Wno-unused-but-set-variable)
set_source_files_properties(
catreq.cc PROPERTIES COMPILE_FLAGS -Wno-unused-but-set-variable
)
endif()

if(HAVE_WIN32)
Expand Down Expand Up @@ -178,11 +180,7 @@ 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}")

Expand All @@ -192,4 +190,3 @@ install(CODE "set(configtemplatedir \"${configtemplatedir}\")")
install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")

install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-dird-configfiles.cmake)

4 changes: 2 additions & 2 deletions core/src/ndmp/CMakeLists.txt
Expand Up @@ -191,8 +191,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})
Expand Down

0 comments on commit 9916659

Please sign in to comment.