Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
cmake: apply cmake-format to all cmake-files
  • Loading branch information
arogge committed Jan 20, 2020
1 parent 7267bc4 commit 6884a70
Show file tree
Hide file tree
Showing 32 changed files with 438 additions and 260 deletions.
54 changes: 41 additions & 13 deletions cmake/BareosVersionFromGit.cmake
Expand Up @@ -19,7 +19,11 @@

if(Git_FOUND)
execute_process(
COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%ct
COMMAND
${GIT_EXECUTABLE}
log
-1
--pretty=format:%ct
RESULT_VARIABLE GIT_COMMIT_TIMESTAMP_RESULT
OUTPUT_VARIABLE GIT_COMMIT_TIMESTAMP
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
Expand All @@ -29,16 +33,28 @@ endif()

if(GIT_COMMIT_TIMESTAMP_RESULT EQUAL 0)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --tags --exact-match --match "Release/*"
--dirty=.dirty
COMMAND
${GIT_EXECUTABLE}
describe
--tags
--exact-match
--match
"Release/*"
--dirty=.dirty
RESULT_VARIABLE GIT_DESCRIBE_RELEASE_RESULT
OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(NOT GIT_DESCRIBE_RELEASE_RESULT EQUAL 0)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --tags --match "WIP/*" --dirty=.dirty
COMMAND
${GIT_EXECUTABLE}
describe
--tags
--match
"WIP/*"
--dirty=.dirty
RESULT_VARIABLE GIT_DESCRIBE_WIP_RESULT
OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
Expand All @@ -48,26 +64,38 @@ if(GIT_COMMIT_TIMESTAMP_RESULT EQUAL 0)
endif()

if(NOT GIT_DESCRIBE_OUTPUT STREQUAL "")
set(GIT_DESCRIBE_REGEX_LONG
"^([^/]+)/([^-]+)-(([^-]+)?)-?([0-9]+)-g([0-9a-f]+(.dirty)?)[ \n]*"
set(
GIT_DESCRIBE_REGEX_LONG
"^([^/]+)/([^-]+)-(([^-]+)?)-?([0-9]+)-g([0-9a-f]+(.dirty)?)[ \n]*"
)
set(GIT_DESCRIBE_REPLACE_LONG "\\2~\\3\\5.\\6")
set(GIT_DESCRIBE_REGEX_SHORT "^([^/]+)/([0-9.]+)((-[^-]+)?)((.dirty)?)[ \n]*")
set(GIT_DESCRIBE_REPLACE_SHORT "\\2\\3\\5")

string(REGEX MATCH "${GIT_DESCRIBE_REGEX_LONG}" GIT_DESCRIBE_REGEX_LONG_MATCH
"${GIT_DESCRIBE_OUTPUT}"
string(
REGEX
MATCH
"${GIT_DESCRIBE_REGEX_LONG}"
GIT_DESCRIBE_REGEX_LONG_MATCH
"${GIT_DESCRIBE_OUTPUT}"
)
if(GIT_DESCRIBE_REGEX_LONG_MATCH STREQUAL "")
string(
REGEX
REPLACE "${GIT_DESCRIBE_REGEX_SHORT}" "${GIT_DESCRIBE_REPLACE_SHORT}"
GIT_DESCRIBE_VERSION "${GIT_DESCRIBE_OUTPUT}"
REPLACE
"${GIT_DESCRIBE_REGEX_SHORT}"
"${GIT_DESCRIBE_REPLACE_SHORT}"
GIT_DESCRIBE_VERSION
"${GIT_DESCRIBE_OUTPUT}"
)
else()
string(REGEX
REPLACE "${GIT_DESCRIBE_REGEX_LONG}" "${GIT_DESCRIBE_REPLACE_LONG}"
GIT_DESCRIBE_VERSION "${GIT_DESCRIBE_OUTPUT}"
string(
REGEX
REPLACE
"${GIT_DESCRIBE_REGEX_LONG}"
"${GIT_DESCRIBE_REPLACE_LONG}"
GIT_DESCRIBE_VERSION
"${GIT_DESCRIBE_OUTPUT}"
)
endif()
endif()
10 changes: 4 additions & 6 deletions core/cmake/BareosCheckFunctions.cmake
Expand Up @@ -34,14 +34,12 @@ check_function_exists(extattr_get_file HAVE_EXTATTR_GET_FILE)
check_function_exists(extattr_get_link HAVE_EXTATTR_GET_LINK)
check_function_exists(extattr_list_file HAVE_EXTATTR_LIST_FILE)
check_function_exists(extattr_list_link HAVE_EXTATTR_LIST_LINK)
check_function_exists(
extattr_namespace_to_string HAVE_EXTATTR_NAMESPACE_TO_STRING
)
check_function_exists(extattr_namespace_to_string
HAVE_EXTATTR_NAMESPACE_TO_STRING)
check_function_exists(extattr_set_file HAVE_EXTATTR_SET_FILE)
check_function_exists(extattr_set_link HAVE_EXTATTR_SET_LINK)
check_function_exists(
extattr_string_to_namespace HAVE_EXTATTR_STRING_TO_NAMESPACE
)
check_function_exists(extattr_string_to_namespace
HAVE_EXTATTR_STRING_TO_NAMESPACE)
check_function_exists(fchownat HAVE_FCHOWNAT)
check_function_exists(fdatasync HAVE_FDATASYNC)
check_function_exists(fseeko HAVE_FSEEKO)
Expand Down
10 changes: 4 additions & 6 deletions core/cmake/BareosCheckIncludes.cmake
Expand Up @@ -103,9 +103,8 @@ check_include_files(api/glfs.h HAVE_API_GLFS_H)
check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H)
check_include_files("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H)
check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H)
check_include_files(
radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H
)
check_include_files(radosstriper/libradosstriper.h
HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H)

# CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H)
check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
Expand All @@ -131,9 +130,8 @@ check_include_files(sys/dir.h HAVE_SYS_DIR_H)
check_include_files(termcap.h HAVE_TERMCAP_H)
check_include_files(term.h HAVE_TERM_H)

check_include_files(
"sys/types.h;sys/scsi/impl/uscsi.h" HAVE_SYS_SCSI_IMPL_USCSI_H
)
check_include_files("sys/types.h;sys/scsi/impl/uscsi.h"
HAVE_SYS_SCSI_IMPL_USCSI_H)
check_include_files("stdio.h;camlib.h" HAVE_CAMLIB_H)
check_include_files(cam/scsi/scsi_message.h HAVE_CAM_SCSI_SCSI_MESSAGE_H)
check_include_files(dev/scsipi/scsipi_all.h HAVE_DEV_SCSIPI_SCSIPI_ALL_H)
Expand Down
22 changes: 18 additions & 4 deletions core/cmake/BareosCheckStructHasMembers.cmake
Expand Up @@ -20,19 +20,33 @@
include(CheckStructHasMember)

check_struct_has_member(
"struct stat" st_blksize sys/stat.h HAVE_STRUCT_STAT_ST_BLKSIZE
"struct stat"
st_blksize
sys/stat.h
HAVE_STRUCT_STAT_ST_BLKSIZE
)
set(HAVE_ST_BLKSIZE ${HAVE_STRUCT_STAT_ST_BLKSIZE})

check_struct_has_member(
"struct stat" st_blocks sys/stat.h HAVE_STRUCT_STAT_ST_BLOCKS
"struct stat"
st_blocks
sys/stat.h
HAVE_STRUCT_STAT_ST_BLOCKS
)
set(HAVE_ST_BLOCKS ${HAVE_STRUCT_STAT_ST_BLOCKS})

check_struct_has_member(
"struct stat" st_rdev sys/stat.h HAVE_STRUCT_STAT_ST_RDEV
"struct stat"
st_rdev
sys/stat.h
HAVE_STRUCT_STAT_ST_RDEV
)
set(HAVE_ST_RDEV ${HAVE_STRUCT_STAT_ST_RDEV})

check_struct_has_member("struct tm" tm_zone time.h HAVE_STRUCT_TM_TM_ZONE)
check_struct_has_member(
"struct tm"
tm_zone
time.h
HAVE_STRUCT_TM_TM_ZONE
)
set(HAVE_TM_ZONE ${HAVE_STRUCT_TM_TM_ZONE})
17 changes: 6 additions & 11 deletions core/cmake/BareosCheckSymbols.cmake
Expand Up @@ -39,28 +39,23 @@ check_symbol_exists(va_copy stdarg.h HAVE_VA_COPY)

cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES ${RADOS_LIBRARIES})
check_symbol_exists(
rados_ioctx_set_namespace rados/librados.h HAVE_RADOS_NAMESPACES
)
check_symbol_exists(
rados_nobjects_list_open rados/librados.h HAVE_RADOS_NOBJECTS_LIST
)
check_symbol_exists(rados_ioctx_set_namespace rados/librados.h
HAVE_RADOS_NAMESPACES)
check_symbol_exists(rados_nobjects_list_open rados/librados.h
HAVE_RADOS_NOBJECTS_LIST)
cmake_pop_check_state()

if(HAVE_GLUSTERFS_API_GLFS_H)
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES ${GFAPI_LIBRARIES})
check_cxx_source_compiles(
"
check_cxx_source_compiles("
#include <glusterfs/api/glfs.h>
int main(void)
{
/* new glfs_ftruncate() passes two additional args */
return glfs_ftruncate(NULL, 0, NULL, NULL);
}
"
GLFS_FTRUNCATE_HAS_FOUR_ARGS
)
" GLFS_FTRUNCATE_HAS_FOUR_ARGS)

endif()
cmake_pop_check_state()
9 changes: 8 additions & 1 deletion core/cmake/BareosConfigureFile.cmake
Expand Up @@ -23,7 +23,14 @@

file(GLOB_RECURSE IN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.in")
foreach(in_file ${IN_FILES})
string(REGEX REPLACE ".in\$" "" file ${in_file})
string(
REGEX
REPLACE
".in\$"
""
file
${in_file}
)
message(STATUS "creating file ${file}")
configure_file(${in_file} ${file} @ONLY)
endforeach()
42 changes: 31 additions & 11 deletions core/cmake/BareosExtractVersionInfo.cmake
Expand Up @@ -41,7 +41,13 @@ else()
message(STATUS "Using version information from ${BareosVersionFile}")
endif()

string(REGEX MATCH [0-9.a-zA-Z~]+ BAREOS_FULL_VERSION ${VERSION_STRING})
string(
REGEX
MATCH
[0-9.a-zA-Z~]+
BAREOS_FULL_VERSION
${VERSION_STRING}
)

if(BAREOS_FULL_VERSION STREQUAL "")
message(FATAL_ERROR "BAREOS_FULL_VERSION is not set")
Expand All @@ -50,17 +56,24 @@ endif()
# set BAREOS_FULL_VERSION in parent scope if there is a parent scope
get_directory_property(hasParent PARENT_DIRECTORY)
if(hasParent)
set(BAREOS_FULL_VERSION
${BAREOS_FULL_VERSION}
PARENT_SCOPE
)
set(BAREOS_FULL_VERSION ${BAREOS_FULL_VERSION} PARENT_SCOPE)
endif()

string(REGEX MATCH [0-9]+.[0-9]+.[0-9]+ BAREOS_NUMERIC_VERSION
${VERSION_STRING}
string(
REGEX
MATCH
[0-9]+.[0-9]+.[0-9]+
BAREOS_NUMERIC_VERSION
${VERSION_STRING}
)

string(REPLACE "." ";" VERSION_LIST ${BAREOS_NUMERIC_VERSION})
string(
REPLACE
"."
";"
VERSION_LIST
${BAREOS_NUMERIC_VERSION}
)
list(GET VERSION_LIST 0 BAREOS_VERSION_MAJOR)
list(GET VERSION_LIST 1 BAREOS_VERSION_MINOR)
list(GET VERSION_LIST 2 BAREOS_VERSION_PATCH)
Expand All @@ -79,7 +92,14 @@ else()
endif()

# extract db version from cats.h
file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/../src/cats/cats.h DB_VERSION_STRING
REGEX .*BDB_VERSION.*
file(
STRINGS ${CMAKE_CURRENT_LIST_DIR}/../src/cats/cats.h DB_VERSION_STRING
REGEX .*BDB_VERSION.*
)
string(
REGEX
MATCH
[0-9]+
BDB_VERSION
${DB_VERSION_STRING}
)
string(REGEX MATCH [0-9]+ BDB_VERSION ${DB_VERSION_STRING})
9 changes: 8 additions & 1 deletion core/cmake/BareosFindAllLibraries.cmake
Expand Up @@ -24,7 +24,14 @@ endif()

if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
# make sure we get python 2 not 3
set(Python_ADDITIONAL_VERSIONS 2.5 2.6 2.7 2.8 2.9)
set(
Python_ADDITIONAL_VERSIONS
2.5
2.6
2.7
2.8
2.9
)
find_package(PythonInterp)
include(FindPythonLibs)

Expand Down
8 changes: 7 additions & 1 deletion core/cmake/BareosFindLibrary.cmake
Expand Up @@ -32,7 +32,13 @@ macro(BareosFindLibrary LIBNAME)

set(LIBFOUND ${${LIB_VAR_NAME}})

string(REGEX MATCH "-NOTFOUND" LIBNOTFOUND ${LIBFOUND})
string(
REGEX
MATCH
"-NOTFOUND"
LIBNOTFOUND
${LIBFOUND}
)
# MESSAGE(STATUS "LIB REGEX MATCH: ${LIBNOTFOUND}")
string(LENGTH "${LIBNOTFOUND}" LIBNOTFOUND)

Expand Down
16 changes: 14 additions & 2 deletions core/cmake/BareosFindLibraryAndHeaders.cmake
Expand Up @@ -43,11 +43,23 @@ macro(BareosFindLibraryAndHeaders LIBNAME HEADERFILE)
set(INCLUDEFOUND ${${INCLUDE_VAR_NAME}})
# MESSAGE(STATUS "INCLUDEFOUND: ${INCLUDEFOUND}")

string(REGEX MATCH "-NOTFOUND" LIBNOTFOUND ${LIBFOUND})
string(
REGEX
MATCH
"-NOTFOUND"
LIBNOTFOUND
${LIBFOUND}
)
# MESSAGE(STATUS "LIB REGEX MATCH: ${LIBNOTFOUND}")
string(LENGTH "${LIBNOTFOUND}" LIBNOTFOUND)

string(REGEX MATCH "-NOTFOUND" INCLUDENOTFOUND ${INCLUDEFOUND})
string(
REGEX
MATCH
"-NOTFOUND"
INCLUDENOTFOUND
${INCLUDEFOUND}
)
# MESSAGE(STATUS "INC REGEX MATCH: ${INCLUDENOTFOUND}")
string(LENGTH "${INCLUDENOTFOUND}" INCLUDENOTFOUND)

Expand Down
1 change: 0 additions & 1 deletion core/cmake/BareosFindPrograms.cmake
Expand Up @@ -40,4 +40,3 @@ find_program(DBX dbx)
find_program(MDB mdb)
find_program(XTRABACKUP xtrabackup)
find_program(MARIABACKUP mariabackup)

21 changes: 7 additions & 14 deletions core/cmake/BareosGenerateDebianInfo.cmake
Expand Up @@ -25,37 +25,30 @@ if(GENERATE_DEBIAN_CONTROL)

if(HAVE_GLUSTERFS)
file(READ ./debian/control.bareos-filedaemon-glusterfs-plugin
DEBIAN_CONTROL_FILEDAEMON_GLUSTERFS_PLUGIN
)
DEBIAN_CONTROL_FILEDAEMON_GLUSTERFS_PLUGIN)
file(READ ./debian/control.bareos-storage-glusterfs
DEBIAN_CONTROL_STORAGE_GLUSTERFS
)
DEBIAN_CONTROL_STORAGE_GLUSTERFS)
endif()

if(HAVE_CEPHFS)
file(READ ./debian/control.bareos-filedaemon-ceph-plugin
DEBIAN_CONTROL_FILEDAEMON_CEPH_PLUGIN
)
DEBIAN_CONTROL_FILEDAEMON_CEPH_PLUGIN)
file(READ ./debian/control.bareos-storage-ceph DEBIAN_CONTROL_STORAGE_CEPH)
endif()

if(HAVE_PYTHON)
file(READ ./debian/control.bareos-filedaemon-python-plugin
DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN
)
DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN)
file(READ ./debian/control.bareos-storage-python-plugin
DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN
)
DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN)
file(READ ./debian/control.bareos-director-python-plugin
DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN
)
DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN)
endif()

if(${DISTNAME} MATCHES "univention")
# only required for univention
file(READ ./debian/control.univention-bareos
DEBIAN_CONTROL_UNIVENTION_BAREOS
)
DEBIAN_CONTROL_UNIVENTION_BAREOS)
endif()

endif()

0 comments on commit 6884a70

Please sign in to comment.