Skip to content

Commit 6515b9e

Browse files
bjoernrickstimopollmeier
bjoernricks
authored and
timopollmeier
committed
misc: Reformat all CMake files with gersemi
Use gersemi for auto formatting all CMake files.
1 parent ab79ccc commit 6515b9e

File tree

6 files changed

+512
-406
lines changed

6 files changed

+512
-406
lines changed

‎CMakeLists.txt

Lines changed: 116 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,30 @@
1515
# You should have received a copy of the GNU Affero General Public License
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

18+
cmake_minimum_required(VERSION 3.5)
1819

19-
cmake_minimum_required (VERSION 3.5)
20+
message("-- Configuring gsad")
2021

21-
message ("-- Configuring gsad")
22+
project(gsad VERSION 24.2.5 LANGUAGES C)
2223

23-
project (gsad VERSION 24.2.5 LANGUAGES C)
24-
25-
if (NOT DEFINED PROJECT_VERSION_STRING)
26-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
27-
include (ProjectVersion)
24+
if(NOT DEFINED PROJECT_VERSION_STRING)
25+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
26+
include(ProjectVersion)
2827
endif()
2928

30-
set (GSAD_VERSION "${PROJECT_VERSION_STRING}")
29+
set(GSAD_VERSION "${PROJECT_VERSION_STRING}")
3130

32-
message (STATUS "Building gsad version ${GSAD_VERSION}")
31+
message(STATUS "Building gsad version ${GSAD_VERSION}")
3332

3433
## Code coverage
3534

36-
OPTION (ENABLE_COVERAGE "Enable support for coverage analysis" OFF)
37-
if (ENABLE_COVERAGE)
38-
set (COVERAGE_FLAGS "--coverage -ftest-coverage -fprofile-arcs")
39-
set (COVERAGE_DIR "${CMAKE_BINARY_DIR}/coverage")
40-
file (MAKE_DIRECTORY ${COVERAGE_DIR})
41-
message ("-- Code Coverage enabled")
42-
endif (ENABLE_COVERAGE)
35+
option(ENABLE_COVERAGE "Enable support for coverage analysis" OFF)
36+
if(ENABLE_COVERAGE)
37+
set(COVERAGE_FLAGS "--coverage -ftest-coverage -fprofile-arcs")
38+
set(COVERAGE_DIR "${CMAKE_BINARY_DIR}/coverage")
39+
file(MAKE_DIRECTORY ${COVERAGE_DIR})
40+
message("-- Code Coverage enabled")
41+
endif(ENABLE_COVERAGE)
4342

4443
## Files generated on installation
4544

@@ -50,108 +49,111 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
5049
enable_testing()
5150

5251
## make format
53-
message (STATUS "Looking for clang-format...")
54-
find_program (CLANG_FORMAT clang-format)
55-
56-
if (CLANG_FORMAT)
57-
message (STATUS "Looking for clang-format... ${CLANG_FORMAT}")
58-
add_custom_target(format COMMAND ${CLANG_FORMAT} "-i" "./src/*.c"
59-
"./src/*.h"
60-
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
61-
else (CLANG_FORMAT)
62-
message (STATUS "clang-format not found.")
63-
endif (CLANG_FORMAT)
64-
65-
if (NOT SYSCONFDIR)
66-
set (SYSCONFDIR "/etc")
67-
endif (NOT SYSCONFDIR)
68-
69-
if (NOT EXEC_PREFIX)
70-
set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
71-
endif (NOT EXEC_PREFIX)
72-
73-
if (NOT BINDIR)
74-
set (BINDIR "${EXEC_PREFIX}/bin")
75-
endif (NOT BINDIR)
76-
77-
if (NOT SBINDIR)
78-
set (SBINDIR "${EXEC_PREFIX}/sbin")
79-
endif (NOT SBINDIR)
80-
81-
if (NOT LIBDIR)
82-
set (LIBDIR "${EXEC_PREFIX}/lib")
83-
endif (NOT LIBDIR)
84-
85-
if (NOT LOCALSTATEDIR)
86-
set (LOCALSTATEDIR "/var")
87-
endif (NOT LOCALSTATEDIR)
88-
89-
if (NOT INCLUDEDIR)
90-
set (INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
91-
endif (NOT INCLUDEDIR)
92-
93-
if (NOT DATADIR)
94-
set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
95-
endif (NOT DATADIR)
96-
97-
set (GSAD_DATA_DIR "${DATADIR}/gvm/gsad")
98-
set (GSAD_CONFIG_DIR "${SYSCONFDIR}/gvm/")
99-
100-
if (NOT GSAD_RUN_DIR)
101-
set (GSAD_RUN_DIR "/run/gsad")
102-
endif (NOT GSAD_RUN_DIR)
103-
104-
if (NOT GSAD_PID_PATH)
105-
set (GSAD_PID_PATH "${GSAD_RUN_DIR}/gsad.pid")
106-
endif (NOT GSAD_PID_PATH)
107-
108-
if (NOT GVMD_RUN_DIR)
109-
set (GVMD_RUN_DIR "/run/gvmd")
110-
endif (NOT GVMD_RUN_DIR)
111-
112-
if (NOT GVM_STATE_DIR)
113-
set (GVM_STATE_DIR "${LOCALSTATEDIR}/lib/gvm")
114-
else (NOT GVM_STATE_DIR)
115-
set (GVM_STATE_DIR "${GVM_STATE_DIR}")
116-
endif (NOT GVM_STATE_DIR)
117-
118-
if (NOT GSAD_LOG_FILE)
119-
if (GVM_LOG_DIR)
120-
set (GSAD_LOG_FILE "${GVM_LOG_DIR}/gsad.log")
121-
else (GVM_LOG_DIR)
122-
set (GSAD_LOG_FILE "-")
123-
endif (GVM_LOG_DIR)
124-
endif (NOT GSAD_LOG_FILE)
125-
126-
if (NOT GVM_SERVER_CERTIFICATE)
127-
set (GVM_SERVER_CERTIFICATE "${GVM_STATE_DIR}/CA/servercert.pem")
128-
else (NOT GVM_SERVER_CERTIFICATE)
129-
set (GVM_SERVER_CERTIFICATE "${GVM_SERVER_CERTIFICATE}")
130-
endif (NOT GVM_SERVER_CERTIFICATE)
131-
132-
if (NOT GVM_SERVER_KEY)
133-
set (GVM_SERVER_KEY "${GVM_STATE_DIR}/private/CA/serverkey.pem")
134-
else (NOT GVM_SERVER_KEY)
135-
set (GVM_SERVER_KEY "${GVM_SERVER_KEY}")
136-
endif (NOT GVM_SERVER_KEY)
137-
138-
if (NOT GVM_CA_CERTIFICATE)
139-
set (GVM_CA_CERTIFICATE "${GVM_STATE_DIR}/CA/cacert.pem")
140-
else (NOT GVM_CA_CERTIFICATE)
141-
set (GVM_CA_CERTIFICATE "${GVM_CA_CERTIFICATE}")
142-
endif (NOT GVM_CA_CERTIFICATE)
143-
144-
145-
configure_file (src/gsad_log_conf.cmake_in src/gsad_log.conf)
52+
message(STATUS "Looking for clang-format...")
53+
find_program(CLANG_FORMAT clang-format)
54+
55+
if(CLANG_FORMAT)
56+
message(STATUS "Looking for clang-format... ${CLANG_FORMAT}")
57+
add_custom_target(
58+
format
59+
COMMAND ${CLANG_FORMAT} "-i" "./src/*.c" "./src/*.h"
60+
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
61+
)
62+
else(CLANG_FORMAT)
63+
message(STATUS "clang-format not found.")
64+
endif(CLANG_FORMAT)
65+
66+
if(NOT SYSCONFDIR)
67+
set(SYSCONFDIR "/etc")
68+
endif(NOT SYSCONFDIR)
69+
70+
if(NOT EXEC_PREFIX)
71+
set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
72+
endif(NOT EXEC_PREFIX)
73+
74+
if(NOT BINDIR)
75+
set(BINDIR "${EXEC_PREFIX}/bin")
76+
endif(NOT BINDIR)
77+
78+
if(NOT SBINDIR)
79+
set(SBINDIR "${EXEC_PREFIX}/sbin")
80+
endif(NOT SBINDIR)
81+
82+
if(NOT LIBDIR)
83+
set(LIBDIR "${EXEC_PREFIX}/lib")
84+
endif(NOT LIBDIR)
85+
86+
if(NOT LOCALSTATEDIR)
87+
set(LOCALSTATEDIR "/var")
88+
endif(NOT LOCALSTATEDIR)
89+
90+
if(NOT INCLUDEDIR)
91+
set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
92+
endif(NOT INCLUDEDIR)
93+
94+
if(NOT DATADIR)
95+
set(DATADIR "${CMAKE_INSTALL_PREFIX}/share")
96+
endif(NOT DATADIR)
97+
98+
set(GSAD_DATA_DIR "${DATADIR}/gvm/gsad")
99+
set(GSAD_CONFIG_DIR "${SYSCONFDIR}/gvm/")
100+
101+
if(NOT GSAD_RUN_DIR)
102+
set(GSAD_RUN_DIR "/run/gsad")
103+
endif(NOT GSAD_RUN_DIR)
104+
105+
if(NOT GSAD_PID_PATH)
106+
set(GSAD_PID_PATH "${GSAD_RUN_DIR}/gsad.pid")
107+
endif(NOT GSAD_PID_PATH)
108+
109+
if(NOT GVMD_RUN_DIR)
110+
set(GVMD_RUN_DIR "/run/gvmd")
111+
endif(NOT GVMD_RUN_DIR)
112+
113+
if(NOT GVM_STATE_DIR)
114+
set(GVM_STATE_DIR "${LOCALSTATEDIR}/lib/gvm")
115+
else(NOT GVM_STATE_DIR)
116+
set(GVM_STATE_DIR "${GVM_STATE_DIR}")
117+
endif(NOT GVM_STATE_DIR)
118+
119+
if(NOT GSAD_LOG_FILE)
120+
if(GVM_LOG_DIR)
121+
set(GSAD_LOG_FILE "${GVM_LOG_DIR}/gsad.log")
122+
else(GVM_LOG_DIR)
123+
set(GSAD_LOG_FILE "-")
124+
endif(GVM_LOG_DIR)
125+
endif(NOT GSAD_LOG_FILE)
126+
127+
if(NOT GVM_SERVER_CERTIFICATE)
128+
set(GVM_SERVER_CERTIFICATE "${GVM_STATE_DIR}/CA/servercert.pem")
129+
else(NOT GVM_SERVER_CERTIFICATE)
130+
set(GVM_SERVER_CERTIFICATE "${GVM_SERVER_CERTIFICATE}")
131+
endif(NOT GVM_SERVER_CERTIFICATE)
132+
133+
if(NOT GVM_SERVER_KEY)
134+
set(GVM_SERVER_KEY "${GVM_STATE_DIR}/private/CA/serverkey.pem")
135+
else(NOT GVM_SERVER_KEY)
136+
set(GVM_SERVER_KEY "${GVM_SERVER_KEY}")
137+
endif(NOT GVM_SERVER_KEY)
138+
139+
if(NOT GVM_CA_CERTIFICATE)
140+
set(GVM_CA_CERTIFICATE "${GVM_STATE_DIR}/CA/cacert.pem")
141+
else(NOT GVM_CA_CERTIFICATE)
142+
set(GVM_CA_CERTIFICATE "${GVM_CA_CERTIFICATE}")
143+
endif(NOT GVM_CA_CERTIFICATE)
144+
145+
configure_file(src/gsad_log_conf.cmake_in src/gsad_log.conf)
146146

147147
## Install
148148

149-
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/gsad_log.conf
150-
DESTINATION ${GSAD_CONFIG_DIR})
149+
install(
150+
FILES ${CMAKE_CURRENT_BINARY_DIR}/src/gsad_log.conf
151+
DESTINATION ${GSAD_CONFIG_DIR}
152+
)
151153

152-
add_subdirectory (src)
153-
add_subdirectory (config)
154+
add_subdirectory(src)
155+
add_subdirectory(config)
154156

155-
add_subdirectory (doc)
157+
add_subdirectory(doc)
156158

157159
# vim: set ts=2 sw=2 tw=80:

‎cmake/GetGit.cmake

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,27 @@
1818

1919
# This script attempts to determine the Git commit ID
2020

21-
find_package (Git)
21+
find_package(Git)
2222

23-
macro (git_get_revision dir variable)
24-
if (GIT_FOUND)
25-
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
26-
WORKING_DIRECTORY ${dir}
27-
ERROR_QUIET
28-
RESULT_VARIABLE GIT_RESULT
29-
OUTPUT_VARIABLE GIT_BRANCH
30-
OUTPUT_STRIP_TRAILING_WHITESPACE)
31-
if (GIT_RESULT EQUAL "0")
32-
execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
33-
WORKING_DIRECTORY ${dir}
34-
OUTPUT_VARIABLE GIT_COMMIT_HASH
35-
OUTPUT_STRIP_TRAILING_WHITESPACE)
36-
string (REPLACE "/" "_" GIT_BRANCH ${GIT_BRANCH})
37-
set (${variable} "${GIT_COMMIT_HASH}-${GIT_BRANCH}")
23+
macro(git_get_revision dir variable)
24+
if(GIT_FOUND)
25+
execute_process(
26+
COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
27+
WORKING_DIRECTORY ${dir}
28+
ERROR_QUIET
29+
RESULT_VARIABLE GIT_RESULT
30+
OUTPUT_VARIABLE GIT_BRANCH
31+
OUTPUT_STRIP_TRAILING_WHITESPACE
32+
)
33+
if(GIT_RESULT EQUAL "0")
34+
execute_process(
35+
COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
36+
WORKING_DIRECTORY ${dir}
37+
OUTPUT_VARIABLE GIT_COMMIT_HASH
38+
OUTPUT_STRIP_TRAILING_WHITESPACE
39+
)
40+
string(REPLACE "/" "_" GIT_BRANCH ${GIT_BRANCH})
41+
set(${variable} "${GIT_COMMIT_HASH}-${GIT_BRANCH}")
3842
endif()
3943
endif()
40-
endmacro ()
44+
endmacro()

‎cmake/ProjectVersion.cmake

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,44 @@
1818

1919
## Retrieve git revision (at configure time)
2020

21-
include (GetGit)
22-
23-
if (NOT CMAKE_BUILD_TYPE MATCHES "Release")
24-
Git_GET_REVISION(${CMAKE_SOURCE_DIR} ProjectRevision)
25-
if (DEFINED ProjectRevision)
26-
set (GIT_REVISION "~git-${ProjectRevision}")
27-
else ()
28-
set (GIT_REVISION "~git")
29-
endif ()
30-
endif (NOT CMAKE_BUILD_TYPE MATCHES "Release")
31-
32-
if (GIT_REVISION)
33-
set (PROJECT_VERSION_GIT "${GIT_REVISION}")
34-
else (GIT_REVISION)
35-
set (PROJECT_VERSION_GIT "")
36-
endif (GIT_REVISION)
21+
include(GetGit)
22+
23+
if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
24+
git_get_revision(${CMAKE_SOURCE_DIR} ProjectRevision)
25+
if(DEFINED ProjectRevision)
26+
set(GIT_REVISION "~git-${ProjectRevision}")
27+
else()
28+
set(GIT_REVISION "~git")
29+
endif()
30+
endif(NOT CMAKE_BUILD_TYPE MATCHES "Release")
31+
32+
if(GIT_REVISION)
33+
set(PROJECT_VERSION_GIT "${GIT_REVISION}")
34+
else(GIT_REVISION)
35+
set(PROJECT_VERSION_GIT "")
36+
endif(GIT_REVISION)
3737

3838
string(LENGTH ${PROJECT_VERSION_MINOR} PROJECT_VERSION_MINOR_LENGTH)
3939

40-
set (PROJECT_VERSION_MINOR_STRING "${PROJECT_VERSION_MINOR}")
40+
set(PROJECT_VERSION_MINOR_STRING "${PROJECT_VERSION_MINOR}")
4141

4242
# If PROJECT_BETA_RELEASE is set to "0", the version string will be set to:
4343
# "major.minor+alpha"
4444
# If PROJECT_BETA_RELEASE is set otherwise, the version string will be set to:
4545
# "major.minor+beta${PROJECT_BETA_RELEASE}"
4646
# If PROJECT_BETA_RELEASE is NOT set, the version string will be set to:
4747
# "major.minor.patch"
48-
if (DEFINED PROJECT_BETA_RELEASE AND NOT PROJECT_BETA_RELEASE STREQUAL "")
49-
if (PROJECT_BETA_RELEASE STREQUAL "0")
50-
set (PROJECT_VERSION_SUFFIX "+alpha")
51-
else (PROJECT_BETA_RELEASE STREQUAL "0")
52-
set (PROJECT_VERSION_SUFFIX "+beta${PROJECT_BETA_RELEASE}")
53-
endif (PROJECT_BETA_RELEASE STREQUAL "0")
54-
elseif (DEFINED PROJECT_VERSION_PATCH AND NOT PROJECT_VERSION_PATCH STREQUAL "")
55-
set (PROJECT_VERSION_SUFFIX ".${PROJECT_VERSION_PATCH}")
56-
endif (DEFINED PROJECT_BETA_RELEASE AND NOT PROJECT_BETA_RELEASE STREQUAL "")
57-
58-
set (PROJECT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR_STRING}${PROJECT_VERSION_SUFFIX}${PROJECT_VERSION_GIT}")
48+
if(DEFINED PROJECT_BETA_RELEASE AND NOT PROJECT_BETA_RELEASE STREQUAL "")
49+
if(PROJECT_BETA_RELEASE STREQUAL "0")
50+
set(PROJECT_VERSION_SUFFIX "+alpha")
51+
else(PROJECT_BETA_RELEASE STREQUAL "0")
52+
set(PROJECT_VERSION_SUFFIX "+beta${PROJECT_BETA_RELEASE}")
53+
endif(PROJECT_BETA_RELEASE STREQUAL "0")
54+
elseif(DEFINED PROJECT_VERSION_PATCH AND NOT PROJECT_VERSION_PATCH STREQUAL "")
55+
set(PROJECT_VERSION_SUFFIX ".${PROJECT_VERSION_PATCH}")
56+
endif(DEFINED PROJECT_BETA_RELEASE AND NOT PROJECT_BETA_RELEASE STREQUAL "")
57+
58+
set(
59+
PROJECT_VERSION_STRING
60+
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR_STRING}${PROJECT_VERSION_SUFFIX}${PROJECT_VERSION_GIT}"
61+
)

0 commit comments

Comments
 (0)