Skip to content

Commit c485dbf

Browse files
committed
style: fix formatting / eol issues
1 parent 2d66564 commit c485dbf

28 files changed

+237
-298
lines changed

.clangd.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# We need to configure the location of the compilation database in this file
2-
# and not in vscode `.settings` until we have a way to get the cmake build
2+
# and not in vscode `.settings` until we have a way to get the cmake build
33
# directory or preset name as a subsititution variable.
44
#
55
# See https://github.com/clangd/vscode-clangd/issues/48

.commitlintrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
"extends": [
33
"@commitlint/config-conventional"
44
]
5-
}
5+
}

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@
6969
"enable_husky": "npx husky install < /dev/null",
7070
"update_python_modules": "pip --disable-pip-version-check --no-cache-dir install -r requirements.txt"
7171
}
72-
}
72+
}

.vscode/extensions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
"cheshirekow.cmake-format",
2020
"editorconfig.editorconfig"
2121
]
22-
}
22+
}

.vscode/settings.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
// One tab = 2 spaces
130130
"editor.tabSize": 2,
131131
// Controls whether a list of suggestions is provided based on the text in the document
132-
"editor.wordBasedSuggestions": true,
132+
"editor.wordBasedSuggestions": "matchingDocuments",
133133
// There is no need to confirm when deleting files
134134
"explorer.confirmDelete": false,
135135
// No confirmation is required when moving files
@@ -150,8 +150,6 @@
150150
"search.smartCase": true,
151151
// The integrated terminal defaults to PowerShell
152152
"terminal.integrated.defaultProfile.windows": "PowerShell",
153-
// Enable visual ringing tone for integrated terminal
154-
"terminal.integrated.enableBell": true,
155153
// Integrated terminal code: zh_CN.UTF-8
156154
"terminal.integrated.env.windows": {
157155
"LC_ALL": "en_US.UTF-8"
@@ -293,4 +291,8 @@
293291
"files.exclude": {
294292
"**/.sphinx": true
295293
},
296-
}
294+
"accessibility.signals.terminalBell": {
295+
"sound": "on"
296+
},
297+
"terminal.integrated.enableVisualBell": true,
298+
}

CMakeLists.txt

+26-26
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ cmake_minimum_required(VERSION 3.14)
1818
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
1919
# But if this project is not the master project, prioritize the master project
2020
# cmake include dir if it exists.
21-
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR
22-
AND EXISTS "${CMAKE_SOURCE_DIR}/cmake")
21+
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR AND EXISTS "${CMAKE_SOURCE_DIR}/cmake")
2322
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
2423
endif()
2524
# Include the log helpers module early so we can use early for logging the
@@ -43,7 +42,7 @@ if(NOT GIT_SHA1)
4342
endif()
4443

4544
# Meta information about the project
46-
# cmake-format: off
45+
# gersemi: off
4746
set(META_PROJECT_NAME "asap")
4847
set(META_PROJECT_DESCRIPTION "Instantly start with a fully loaded CMake project")
4948
set(META_AUTHOR_ORGANIZATION "The Authors")
@@ -56,7 +55,7 @@ set(META_VERSION_PATCH "0")
5655
set(META_VERSION_REVISION "${GIT_REV}")
5756
set(META_VERSION "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
5857
set(META_NAME_VERSION "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")
59-
# cmake-format: on
58+
# gersemi: on
6059

6160
string(MAKE_C_IDENTIFIER ${META_PROJECT_NAME} META_PROJECT_ID)
6261
string(TOUPPER ${META_PROJECT_ID} META_PROJECT_ID)
@@ -134,7 +133,8 @@ project(
134133
VERSION ${META_VERSION}
135134
DESCRIPTION ${META_PROJECT_DESCRIPTION}
136135
HOMEPAGE_URL ${META_GITHUB_REPO}
137-
LANGUAGES C CXX)
136+
LANGUAGES C CXX
137+
)
138138

139139
# Set output directories
140140
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -161,9 +161,7 @@ include(cmake/FasterBuild.cmake)
161161
# ------------------------------------------------------------------------------
162162

163163
# Generate version-header
164-
configure_file(
165-
templates/version.h.in
166-
${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_ID_LOWER}/version.h)
164+
configure_file(templates/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_ID_LOWER}/version.h)
167165

168166
# Generate a clangd configuration file that points to the compilation database
169167
# in the cmake build directory. We need to do this as the build directory is
@@ -178,15 +176,15 @@ configure_file(.clangd.in ${CMAKE_SOURCE_DIR}/.clangd @ONLY)
178176

179177
if(ASAP_BUILD_DOCS)
180178
if(ASAP_WITH_DOXYGEN)
181-
# Doxygen
182-
set(DOXYGEN_BUILD_DIR "${CMAKE_BINARY_DIR}/dox")
183-
include(DoxGeneration)
179+
# Doxygen
180+
set(DOXYGEN_BUILD_DIR "${CMAKE_BINARY_DIR}/dox")
181+
include(DoxGeneration)
184182
endif()
185183

186184
if(ASAP_WITH_SPHINX)
187-
# Sphinx/breathe/exhale
188-
set(SPHINX_BUILD_DIR "${CMAKE_BINARY_DIR}/sphinx")
189-
include(SphinxGeneration)
185+
# Sphinx/breathe/exhale
186+
set(SPHINX_BUILD_DIR "${CMAKE_BINARY_DIR}/sphinx")
187+
include(SphinxGeneration)
190188
endif()
191189
endif()
192190

@@ -201,7 +199,9 @@ if(ASAP_BUILD_TESTS)
201199
include(CodeCoverage)
202200
# Enable this target when the project has test cases
203201
asap_add_code_coverage_all_targets()
204-
include(Valgrind)
202+
if(ASAP_WITH_VALGRIND)
203+
include(Valgrind)
204+
endif()
205205

206206
cpmaddpackage(
207207
NAME
@@ -212,7 +212,8 @@ if(ASAP_BUILD_TESTS)
212212
google/googletest
213213
OPTIONS
214214
"gtest_force_shared_crt ON"
215-
"INSTALL_GTEST OFF")
215+
"INSTALL_GTEST OFF"
216+
)
216217

217218
include(GoogleTest)
218219
endif()
@@ -245,14 +246,13 @@ include(AsapInstall)
245246
# optimization. For some projects you may want to set a default build type so
246247
# that you do not have to remember to set it.
247248
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
248-
message(
249-
STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
250-
set(CMAKE_BUILD_TYPE
251-
RelWithDebInfo
252-
CACHE STRING "Choose the type of build." FORCE)
249+
message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
250+
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
253251
# Set the possible values of build type for cmake-gui
254-
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
255-
"MinSizeRel" "RelWithDebInfo")
252+
set_property(
253+
CACHE CMAKE_BUILD_TYPE
254+
PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo"
255+
)
256256
endif()
257257

258258
# ------------------------------------------------------------------------------
@@ -265,7 +265,7 @@ endif()
265265

266266
# Set runtime path
267267
set(CMAKE_SKIP_BUILD_RPATH FALSE) # Add absolute path to all dependencies for
268-
# BUILD
268+
# BUILD
269269
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
270270
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
271271

@@ -290,8 +290,8 @@ add_subdirectory(tools/version-info)
290290

291291
if(${META_PROJECT_ID}_IS_MASTER_PROJECT)
292292
if(ASAP_WITH_CLANG_TIDY)
293-
include(ClangTidy)
294-
asap_create_clang_tidy_targets()
293+
include(ClangTidy)
294+
asap_create_clang_tidy_targets()
295295
endif()
296296

297297
if(ASAP_WITH_CLANG_FORMAT)

CMakePresets.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -434,4 +434,4 @@
434434
"configurePreset": "dev-gcc"
435435
}
436436
]
437-
}
437+
}

cmake/AsapInstall.cmake

+35-54
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
# Determine if this is built as a subproject or if it is the master project.
22

33
if(NOT DEFINED ${META_PROJECT_ID}_INSTALL)
4-
option(${META_PROJECT_ID}_INSTALL
5-
"Generate the install target for this project."
6-
${${META_PROJECT_ID}_IS_MASTER_PROJECT})
4+
option(${META_PROJECT_ID}_INSTALL "Generate the install target for this project." ${${META_PROJECT_ID}_IS_MASTER_PROJECT})
75
endif()
86

97
macro(_setup_install_dirs)
108
message(STATUS "Using CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
119
# Check for system dir install
1210
set(_system_dir_install FALSE)
13-
if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}"
14-
STREQUAL "/usr/local")
11+
if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
1512
set(_system_dir_install TRUE)
1613
endif()
1714

@@ -20,34 +17,34 @@ macro(_setup_install_dirs)
2017
# Installation paths
2118
include(GNUInstallDirs)
2219
# Install into the system (/usr/bin or /usr/local/bin)
23-
set(ASAP_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") # /usr/[local]/lib
24-
set(ASAP_INSTALL_SHARED "${ASAP_INSTALL_LIB}") # /usr/[local]/lib
25-
set(ASAP_INSTALL_CMAKE "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${META_PROJECT_NAME}") # /usr/[local]/share/cmake/<project>
26-
set(ASAP_INSTALL_PKGCONFIG "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig") # /usr/[local]/share/pkgconfig
27-
set(ASAP_INSTALL_EXAMPLES "${CMAKE_INSTALL_DATAROOTDIR}/${META_PROJECT_NAME}/examples") # /usr/[local]/share/<project>/examples
28-
set(ASAP_INSTALL_DATA "${CMAKE_INSTALL_DATAROOTDIR}/${META_PROJECT_NAME}") # /usr/[local]/share/<project>
29-
set(ASAP_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}") # /usr/[local]/bin
30-
set(ASAP_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}") # /usr/[local]/include
31-
set(ASAP_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}") # /usr/[local]/share/doc/<project>
32-
set(ASAP_INSTALL_SHORTCUTS "${CMAKE_INSTALL_DATAROOTDIR}/applications") # /usr/[local]/share/applications
33-
set(ASAP_INSTALL_ICONS "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps") # /usr/[local]/share/pixmaps
34-
set(ASAP_INSTALL_INIT "/etc/init") # /etc/init (upstart init scripts)
35-
set(ASAP_INSTALL_MISC "${CMAKE_INSTALL_DATAROOTDIR}/${META_PROJECT_NAME}") # /etc/init (upstart init scripts)
20+
set(ASAP_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") # /usr/[local]/lib
21+
set(ASAP_INSTALL_SHARED "${ASAP_INSTALL_LIB}") # /usr/[local]/lib
22+
set(ASAP_INSTALL_CMAKE "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${META_PROJECT_NAME}") # /usr/[local]/share/cmake/<project>
23+
set(ASAP_INSTALL_PKGCONFIG "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig") # /usr/[local]/share/pkgconfig
24+
set(ASAP_INSTALL_EXAMPLES "${CMAKE_INSTALL_DATAROOTDIR}/${META_PROJECT_NAME}/examples") # /usr/[local]/share/<project>/examples
25+
set(ASAP_INSTALL_DATA "${CMAKE_INSTALL_DATAROOTDIR}/${META_PROJECT_NAME}") # /usr/[local]/share/<project>
26+
set(ASAP_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}") # /usr/[local]/bin
27+
set(ASAP_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}") # /usr/[local]/include
28+
set(ASAP_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}") # /usr/[local]/share/doc/<project>
29+
set(ASAP_INSTALL_SHORTCUTS "${CMAKE_INSTALL_DATAROOTDIR}/applications") # /usr/[local]/share/applications
30+
set(ASAP_INSTALL_ICONS "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps") # /usr/[local]/share/pixmaps
31+
set(ASAP_INSTALL_INIT "/etc/init") # /etc/init (upstart init scripts)
32+
set(ASAP_INSTALL_MISC "${CMAKE_INSTALL_DATAROOTDIR}/${META_PROJECT_NAME}") # /etc/init (upstart init scripts)
3633
else()
3734
# Install into local directory
38-
set(ASAP_INSTALL_LIB "${CMAKE_INSTALL_PREFIX}/lib") # ./lib
39-
set(ASAP_INSTALL_SHARED "${ASAP_INSTALL_LIB}") # ./lib
40-
set(ASAP_INSTALL_CMAKE "${CMAKE_INSTALL_PREFIX}/share/cmake/${META_PROJECT_NAME}") # ./share/cmake/<project>
41-
set(ASAP_INSTALL_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") # ./share/pkgconfig
42-
set(ASAP_INSTALL_EXAMPLES "${CMAKE_INSTALL_PREFIX}/examples") # ./examples
43-
set(ASAP_INSTALL_DATA "${CMAKE_INSTALL_PREFIX}") # ./
44-
set(ASAP_INSTALL_BIN "${CMAKE_INSTALL_PREFIX}/bin") # ./bin
45-
set(ASAP_INSTALL_INCLUDE "${CMAKE_INSTALL_PREFIX}/include") # ./include
46-
set(ASAP_INSTALL_DOC "${CMAKE_INSTALL_PREFIX}/doc") # ./doc
47-
set(ASAP_INSTALL_SHORTCUTS "${CMAKE_INSTALL_PREFIX}/shortcuts") # ./shortcuts
48-
set(ASAP_INSTALL_ICONS "${CMAKE_INSTALL_PREFIX}/icons") # ./icons
49-
set(ASAP_INSTALL_INIT "${CMAKE_INSTALL_PREFIX}/init") # ./init
50-
set(ASAP_INSTALL_MISC "${CMAKE_INSTALL_PREFIX}") # ./
35+
set(ASAP_INSTALL_LIB "${CMAKE_INSTALL_PREFIX}/lib") # ./lib
36+
set(ASAP_INSTALL_SHARED "${ASAP_INSTALL_LIB}") # ./lib
37+
set(ASAP_INSTALL_CMAKE "${CMAKE_INSTALL_PREFIX}/share/cmake/${META_PROJECT_NAME}") # ./share/cmake/<project>
38+
set(ASAP_INSTALL_PKGCONFIG "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") # ./share/pkgconfig
39+
set(ASAP_INSTALL_EXAMPLES "${CMAKE_INSTALL_PREFIX}/examples") # ./examples
40+
set(ASAP_INSTALL_DATA "${CMAKE_INSTALL_PREFIX}") # ./
41+
set(ASAP_INSTALL_BIN "${CMAKE_INSTALL_PREFIX}/bin") # ./bin
42+
set(ASAP_INSTALL_INCLUDE "${CMAKE_INSTALL_PREFIX}/include") # ./include
43+
set(ASAP_INSTALL_DOC "${CMAKE_INSTALL_PREFIX}/doc") # ./doc
44+
set(ASAP_INSTALL_SHORTCUTS "${CMAKE_INSTALL_PREFIX}/shortcuts") # ./shortcuts
45+
set(ASAP_INSTALL_ICONS "${CMAKE_INSTALL_PREFIX}/icons") # ./icons
46+
set(ASAP_INSTALL_INIT "${CMAKE_INSTALL_PREFIX}/init") # ./init
47+
set(ASAP_INSTALL_MISC "${CMAKE_INSTALL_PREFIX}") # ./
5148
endif()
5249
# cmake-format: on
5350
endmacro()
@@ -70,39 +67,23 @@ if(${META_PROJECT_ID}_INSTALL)
7067
set(docs "${META_PROJECT_NAME}_docs")
7168

7269
# Install the project meta files
73-
install(
74-
FILES AUTHORS
75-
DESTINATION ${ASAP_INSTALL_MISC}
76-
COMPONENT ${meta})
77-
install(
78-
FILES LICENSE
79-
DESTINATION ${ASAP_INSTALL_MISC}
80-
COMPONENT ${meta})
81-
install(
82-
FILES README.md
83-
DESTINATION ${ASAP_INSTALL_MISC}
84-
COMPONENT ${meta})
70+
install(FILES AUTHORS DESTINATION ${ASAP_INSTALL_MISC} COMPONENT ${meta})
71+
install(FILES LICENSE DESTINATION ${ASAP_INSTALL_MISC} COMPONENT ${meta})
72+
install(FILES README.md DESTINATION ${ASAP_INSTALL_MISC} COMPONENT ${meta})
8573

8674
# Install generated header files
8775
install(
8876
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_ID_LOWER}
8977
DESTINATION ${ASAP_INSTALL_INCLUDE}
90-
COMPONENT ${dev})
78+
COMPONENT ${dev}
79+
)
9180

9281
# Install master docs
9382
string(MAKE_C_IDENTIFIER ${META_PROJECT_NAME} project_id)
9483
string(TOLOWER ${project_id} project_id)
9584
set(master_sphinx_target ${project_id}_master)
96-
install(
97-
DIRECTORY ${SPHINX_BUILD_DIR}/${master_sphinx_target}
98-
DESTINATION ${ASAP_INSTALL_DOC}
99-
COMPONENT ${docs}
100-
OPTIONAL)
85+
install(DIRECTORY ${SPHINX_BUILD_DIR}/${master_sphinx_target} DESTINATION ${ASAP_INSTALL_DOC} COMPONENT ${docs} OPTIONAL)
10186

10287
# Install data
103-
install(
104-
DIRECTORY ${PROJECT_SOURCE_DIR}/data
105-
DESTINATION ${ASAP_INSTALL_DATA}
106-
COMPONENT ${data}
107-
OPTIONAL)
88+
install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${ASAP_INSTALL_DATA} COMPONENT ${data} OPTIONAL)
10889
endif()

0 commit comments

Comments
 (0)