ci: pre-commit cmake-format checks fixed

This commit is contained in:
Mateusz Pusz
2022-04-24 22:55:30 +02:00
parent be678e8ffa
commit 98da140fae
19 changed files with 200 additions and 242 deletions

View File

@ -4,19 +4,25 @@ parse:
pargs: pargs:
nargs: 1 nargs: 1
flags: flags:
- ALL - ALL
kwargs: kwargs:
BREATHE_PROJECT: 1 BREATHE_PROJECT: 1
CODE_SOURCE_DIR: 1 CODE_SOURCE_DIR: 1
INSTALL_DIR: 1 INSTALL_DIR: 1
CODE_DEPENDS: 1 CODE_DEPENDS: 1
DOCS_DEPENDS: 1 DOCS_DEPENDS: 1
add_units_module:
pargs:
nargs: 1
kwargs:
DEPENDENCIES: +
HEADERS: +
enable_iwyu: enable_iwyu:
pargs: pargs:
flags: flags:
- NO_FORWARD_DECLARATIONS - NO_FORWARD_DECLARATIONS
- QUOTED_INCLUDES_FIRST - QUOTED_INCLUDES_FIRST
- NO_COMMENTS - NO_COMMENTS
kwargs: kwargs:
MAPPING_FILE: 1 MAPPING_FILE: 1
MAX_LINE_LENGTH: 1 MAX_LINE_LENGTH: 1

View File

@ -80,15 +80,18 @@
# If provided, the generated target is excluded from the 'all' target. # If provided, the generated target is excluded from the 'all' target.
# #
function(add_header_test target) function(add_header_test target)
cmake_parse_arguments(ARGS "EXCLUDE_FROM_ALL" # options cmake_parse_arguments(
"" # 1 value args ARGS
"HEADERS;EXCLUDE" # multivalued args "EXCLUDE_FROM_ALL" # options
${ARGN}) "" # 1 value args
if (NOT ARGS_HEADERS) "HEADERS;EXCLUDE" # multivalued args
${ARGN}
)
if(NOT ARGS_HEADERS)
message(FATAL_ERROR "The `HEADERS` argument must be provided.") message(FATAL_ERROR "The `HEADERS` argument must be provided.")
endif() endif()
if (ARGS_EXCLUDE_FROM_ALL) if(ARGS_EXCLUDE_FROM_ALL)
set(ARGS_EXCLUDE_FROM_ALL "EXCLUDE_FROM_ALL") set(ARGS_EXCLUDE_FROM_ALL "EXCLUDE_FROM_ALL")
else() else()
set(ARGS_EXCLUDE_FROM_ALL "") set(ARGS_EXCLUDE_FROM_ALL "")
@ -97,12 +100,12 @@ function(add_header_test target)
foreach(header ${ARGS_HEADERS}) foreach(header ${ARGS_HEADERS})
set(skip FALSE) set(skip FALSE)
foreach(exclude ${ARGS_EXCLUDE}) foreach(exclude ${ARGS_EXCLUDE})
if (${header} MATCHES ${exclude}) if(${header} MATCHES ${exclude})
set(skip TRUE) set(skip TRUE)
break() break()
endif() endif()
endforeach() endforeach()
if (skip) if(skip)
continue() continue()
endif() endif()
@ -110,19 +113,17 @@ function(add_header_test target)
get_filename_component(directory "${header}" DIRECTORY) get_filename_component(directory "${header}" DIRECTORY)
set(source "${CMAKE_CURRENT_BINARY_DIR}/headers/${directory}/${filename}.cpp") set(source "${CMAKE_CURRENT_BINARY_DIR}/headers/${directory}/${filename}.cpp")
if (NOT EXISTS "${source}") if(NOT EXISTS "${source}")
file(WRITE "${source}" "#include <${header}>") file(WRITE "${source}" "#include <${header}>")
endif() endif()
list(APPEND sources "${source}") list(APPEND sources "${source}")
endforeach() endforeach()
set(standalone_main "${CMAKE_CURRENT_BINARY_DIR}/headers/_standalone_main.cpp") set(standalone_main "${CMAKE_CURRENT_BINARY_DIR}/headers/_standalone_main.cpp")
if (NOT EXISTS "${standalone_main}") if(NOT EXISTS "${standalone_main}")
file(WRITE "${standalone_main}" "int main() { }") file(WRITE "${standalone_main}" "int main() { }")
endif() endif()
add_executable(${target} add_executable(
${ARGS_EXCLUDE_FROM_ALL} ${target} ${ARGS_EXCLUDE_FROM_ALL} ${sources} "${CMAKE_CURRENT_BINARY_DIR}/headers/_standalone_main.cpp"
${sources}
"${CMAKE_CURRENT_BINARY_DIR}/headers/_standalone_main.cpp"
) )
endfunction() endfunction()

View File

@ -65,4 +65,3 @@ function(add_public_header_test target test_target)
target_link_libraries(${target} PRIVATE ${test_target}) target_link_libraries(${target} PRIVATE ${test_target})
target_include_directories(${target} PRIVATE .) target_include_directories(${target} PRIVATE .)
endfunction() endfunction()

View File

@ -24,8 +24,7 @@ cmake_minimum_required(VERSION 3.19)
function(validate_unparsed module prefix) function(validate_unparsed module prefix)
if(${prefix}_UNPARSED_ARGUMENTS) if(${prefix}_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Invalid arguments '${${prefix}_UNPARSED_ARGUMENTS}' " message(FATAL_ERROR "Invalid arguments '${${prefix}_UNPARSED_ARGUMENTS}' " "for module '${module}'")
"for module '${module}'")
endif() endif()
endfunction() endfunction()
@ -49,11 +48,7 @@ endfunction()
function(add_units_module name) function(add_units_module name)
# parse arguments # parse arguments
set(multiValues DEPENDENCIES HEADERS) set(multiValues DEPENDENCIES HEADERS)
cmake_parse_arguments( cmake_parse_arguments(PARSE_ARGV 1 ARG "" "" "${multiValues}")
PARSE_ARGV 1
ARG
"" "" "${multiValues}"
)
# validate and process arguments # validate and process arguments
validate_unparsed(${name} ARG) validate_unparsed(${name} ARG)

View File

@ -25,12 +25,7 @@ cmake_minimum_required(VERSION 3.19)
option(${projectPrefix}USE_LIBFMT "Enables usage of libfmt instead of the one from 'std'" ON) option(${projectPrefix}USE_LIBFMT "Enables usage of libfmt instead of the one from 'std'" ON)
message(STATUS "${projectPrefix}USE_LIBFMT: ${${projectPrefix}USE_LIBFMT}") message(STATUS "${projectPrefix}USE_LIBFMT: ${${projectPrefix}USE_LIBFMT}")
add_units_module(core-fmt add_units_module(core-fmt DEPENDENCIES mp-units::core HEADERS include/units/format.h)
DEPENDENCIES
mp-units::core
HEADERS
include/units/format.h
)
target_compile_definitions(mp-units-core-fmt INTERFACE ${projectPrefix}USE_LIBFMT=$<BOOL:${${projectPrefix}USE_LIBFMT}>) target_compile_definitions(mp-units-core-fmt INTERFACE ${projectPrefix}USE_LIBFMT=$<BOOL:${${projectPrefix}USE_LIBFMT}>)
if(${projectPrefix}USE_LIBFMT) if(${projectPrefix}USE_LIBFMT)

View File

@ -22,9 +22,4 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(core-io add_units_module(core-io DEPENDENCIES mp-units::core HEADERS include/units/quantity_io.h)
DEPENDENCIES
mp-units::core
HEADERS
include/units/quantity_io.h
)

View File

@ -34,7 +34,9 @@ include(CheckLibcxxInUse)
check_libcxx_in_use(${projectPrefix}LIBCXX) check_libcxx_in_use(${projectPrefix}LIBCXX)
# core library definition # core library definition
add_library(mp-units-core INTERFACE add_library(
mp-units-core
INTERFACE
include/units/base_dimension.h include/units/base_dimension.h
include/units/chrono.h include/units/chrono.h
include/units/concepts.h include/units/concepts.h

View File

@ -22,14 +22,10 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(isq-iec80000 add_units_module(
DEPENDENCIES isq-iec80000
mp-units::si DEPENDENCIES mp-units::si
HEADERS HEADERS include/units/isq/iec80000/binary_prefixes.h include/units/isq/iec80000/iec80000.h
include/units/isq/iec80000/binary_prefixes.h include/units/isq/iec80000/modulation_rate.h include/units/isq/iec80000/storage_capacity.h
include/units/isq/iec80000/iec80000.h include/units/isq/iec80000/traffic_intensity.h include/units/isq/iec80000/transfer_rate.h
include/units/isq/iec80000/modulation_rate.h
include/units/isq/iec80000/storage_capacity.h
include/units/isq/iec80000/traffic_intensity.h
include/units/isq/iec80000/transfer_rate.h
) )

View File

@ -22,19 +22,18 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(isq-natural add_units_module(
DEPENDENCIES isq-natural
mp-units::isq DEPENDENCIES mp-units::isq
HEADERS HEADERS include/units/isq/natural/acceleration.h
include/units/isq/natural/acceleration.h include/units/isq/natural/constants.h
include/units/isq/natural/constants.h include/units/isq/natural/energy.h
include/units/isq/natural/energy.h include/units/isq/natural/force.h
include/units/isq/natural/force.h include/units/isq/natural/length.h
include/units/isq/natural/length.h include/units/isq/natural/mass.h
include/units/isq/natural/mass.h include/units/isq/natural/momentum.h
include/units/isq/natural/momentum.h include/units/isq/natural/natural.h
include/units/isq/natural/natural.h include/units/isq/natural/speed.h
include/units/isq/natural/speed.h include/units/isq/natural/time.h
include/units/isq/natural/time.h include/units/isq/natural/units.h
include/units/isq/natural/units.h
) )

View File

@ -22,53 +22,52 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(isq add_units_module(
DEPENDENCIES isq
mp-units::core DEPENDENCIES mp-units::core
HEADERS HEADERS include/units/isq/dimensions/absorbed_dose.h
include/units/isq/dimensions/absorbed_dose.h include/units/isq/dimensions/acceleration.h
include/units/isq/dimensions/acceleration.h include/units/isq/dimensions/amount_of_substance.h
include/units/isq/dimensions/amount_of_substance.h include/units/isq/dimensions/angular_velocity.h
include/units/isq/dimensions/angular_velocity.h include/units/isq/dimensions/area.h
include/units/isq/dimensions/area.h include/units/isq/dimensions/capacitance.h
include/units/isq/dimensions/capacitance.h include/units/isq/dimensions/catalytic_activity.h
include/units/isq/dimensions/catalytic_activity.h include/units/isq/dimensions/charge_density.h
include/units/isq/dimensions/charge_density.h include/units/isq/dimensions/concentration.h
include/units/isq/dimensions/concentration.h include/units/isq/dimensions/conductance.h
include/units/isq/dimensions/conductance.h include/units/isq/dimensions/current_density.h
include/units/isq/dimensions/current_density.h include/units/isq/dimensions/density.h
include/units/isq/dimensions/density.h include/units/isq/dimensions/dynamic_viscosity.h
include/units/isq/dimensions/dynamic_viscosity.h include/units/isq/dimensions/electric_charge.h
include/units/isq/dimensions/electric_charge.h include/units/isq/dimensions/electric_current.h
include/units/isq/dimensions/electric_current.h include/units/isq/dimensions/electric_field_strength.h
include/units/isq/dimensions/electric_field_strength.h include/units/isq/dimensions/energy.h
include/units/isq/dimensions/energy.h include/units/isq/dimensions/energy_density.h
include/units/isq/dimensions/energy_density.h include/units/isq/dimensions/force.h
include/units/isq/dimensions/force.h include/units/isq/dimensions/frequency.h
include/units/isq/dimensions/frequency.h include/units/isq/dimensions/heat_capacity.h
include/units/isq/dimensions/heat_capacity.h include/units/isq/dimensions/inductance.h
include/units/isq/dimensions/inductance.h include/units/isq/dimensions/length.h
include/units/isq/dimensions/length.h include/units/isq/dimensions/luminance.h
include/units/isq/dimensions/luminance.h include/units/isq/dimensions/luminous_intensity.h
include/units/isq/dimensions/luminous_intensity.h include/units/isq/dimensions/magnetic_flux.h
include/units/isq/dimensions/magnetic_flux.h include/units/isq/dimensions/magnetic_induction.h
include/units/isq/dimensions/magnetic_induction.h include/units/isq/dimensions/mass.h
include/units/isq/dimensions/mass.h include/units/isq/dimensions/molar_energy.h
include/units/isq/dimensions/molar_energy.h include/units/isq/dimensions/momentum.h
include/units/isq/dimensions/momentum.h include/units/isq/dimensions/permeability.h
include/units/isq/dimensions/permeability.h include/units/isq/dimensions/permittivity.h
include/units/isq/dimensions/permittivity.h include/units/isq/dimensions/power.h
include/units/isq/dimensions/power.h include/units/isq/dimensions/pressure.h
include/units/isq/dimensions/pressure.h include/units/isq/dimensions/radioactivity.h
include/units/isq/dimensions/radioactivity.h include/units/isq/dimensions/resistance.h
include/units/isq/dimensions/resistance.h include/units/isq/dimensions/speed.h
include/units/isq/dimensions/speed.h include/units/isq/dimensions/surface_tension.h
include/units/isq/dimensions/surface_tension.h include/units/isq/dimensions/thermal_conductivity.h
include/units/isq/dimensions/thermal_conductivity.h include/units/isq/dimensions/thermodynamic_temperature.h
include/units/isq/dimensions/thermodynamic_temperature.h include/units/isq/dimensions/time.h
include/units/isq/dimensions/time.h include/units/isq/dimensions/torque.h
include/units/isq/dimensions/torque.h include/units/isq/dimensions/voltage.h
include/units/isq/dimensions/voltage.h include/units/isq/dimensions/volume.h
include/units/isq/dimensions/volume.h include/units/isq/dimensions.h
include/units/isq/dimensions.h
) )

View File

@ -22,19 +22,18 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si-cgs add_units_module(
DEPENDENCIES si-cgs
mp-units::si DEPENDENCIES mp-units::si
HEADERS HEADERS include/units/isq/si/cgs/acceleration.h
include/units/isq/si/cgs/acceleration.h include/units/isq/si/cgs/area.h
include/units/isq/si/cgs/area.h include/units/isq/si/cgs/cgs.h
include/units/isq/si/cgs/cgs.h include/units/isq/si/cgs/energy.h
include/units/isq/si/cgs/energy.h include/units/isq/si/cgs/force.h
include/units/isq/si/cgs/force.h include/units/isq/si/cgs/length.h
include/units/isq/si/cgs/length.h include/units/isq/si/cgs/mass.h
include/units/isq/si/cgs/mass.h include/units/isq/si/cgs/power.h
include/units/isq/si/cgs/power.h include/units/isq/si/cgs/pressure.h
include/units/isq/si/cgs/pressure.h include/units/isq/si/cgs/speed.h
include/units/isq/si/cgs/speed.h include/units/isq/si/cgs/time.h
include/units/isq/si/cgs/time.h
) )

View File

@ -22,22 +22,20 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si-fps add_units_module(
DEPENDENCIES si-fps
mp-units::si DEPENDENCIES mp-units::si
HEADERS HEADERS include/units/isq/si/fps/acceleration.h
include/units/isq/si/fps/acceleration.h include/units/isq/si/fps/area.h
include/units/isq/si/fps/area.h include/units/isq/si/fps/density.h
include/units/isq/si/fps/density.h include/units/isq/si/fps/energy.h
include/units/isq/si/fps/energy.h include/units/isq/si/fps/force.h
include/units/isq/si/fps/force.h include/units/isq/si/fps/fps.h
include/units/isq/si/fps/fps.h include/units/isq/si/fps/length.h
include/units/isq/si/fps/length.h include/units/isq/si/fps/mass.h
include/units/isq/si/fps/mass.h include/units/isq/si/fps/power.h
include/units/isq/si/fps/power.h include/units/isq/si/fps/pressure.h
include/units/isq/si/fps/pressure.h include/units/isq/si/fps/speed.h
include/units/isq/si/fps/speed.h include/units/isq/si/fps/time.h
include/units/isq/si/fps/time.h include/units/isq/si/fps/volume.h
include/units/isq/si/fps/volume.h
) )

View File

@ -22,13 +22,8 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si-hep add_units_module(
DEPENDENCIES si-hep DEPENDENCIES mp-units::si
mp-units::si HEADERS include/units/isq/si/hep/area.h include/units/isq/si/hep/energy.h include/units/isq/si/hep/hep.h
HEADERS include/units/isq/si/hep/mass.h include/units/isq/si/hep/momentum.h
include/units/isq/si/hep/area.h
include/units/isq/si/hep/energy.h
include/units/isq/si/hep/hep.h
include/units/isq/si/hep/mass.h
include/units/isq/si/hep/momentum.h
) )

View File

@ -22,10 +22,6 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si-iau add_units_module(
DEPENDENCIES si-iau DEPENDENCIES mp-units::si HEADERS include/units/isq/si/iau/iau.h include/units/isq/si/iau/length.h
mp-units::si
HEADERS
include/units/isq/si/iau/iau.h
include/units/isq/si/iau/length.h
) )

View File

@ -22,10 +22,7 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si-imperial add_units_module(
DEPENDENCIES si-imperial DEPENDENCIES mp-units::si HEADERS include/units/isq/si/imperial/imperial.h
mp-units::si include/units/isq/si/imperial/length.h
HEADERS
include/units/isq/si/imperial/imperial.h
include/units/isq/si/imperial/length.h
) )

View File

@ -22,14 +22,10 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si-international add_units_module(
DEPENDENCIES si-international
mp-units::si DEPENDENCIES mp-units::si
HEADERS HEADERS include/units/isq/si/international/area.h include/units/isq/si/international/international.h
include/units/isq/si/international/area.h include/units/isq/si/international/length.h include/units/isq/si/international/speed.h
include/units/isq/si/international/international.h include/units/isq/si/international/volume.h
include/units/isq/si/international/length.h
include/units/isq/si/international/speed.h
include/units/isq/si/international/volume.h
) )

View File

@ -22,11 +22,7 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si-typographic add_units_module(
DEPENDENCIES si-typographic DEPENDENCIES mp-units::si HEADERS include/units/isq/si/typographic/length.h
mp-units::si include/units/isq/si/typographic/typographic.h
HEADERS
include/units/isq/si/typographic/length.h
include/units/isq/si/typographic/typographic.h
) )

View File

@ -22,11 +22,6 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si-uscs add_units_module(
DEPENDENCIES si-uscs DEPENDENCIES mp-units::si HEADERS include/units/isq/si/uscs/length.h include/units/isq/si/uscs/uscs.h
mp-units::si
HEADERS
include/units/isq/si/uscs/length.h
include/units/isq/si/uscs/uscs.h
) )

View File

@ -22,55 +22,54 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
add_units_module(si add_units_module(
DEPENDENCIES si
mp-units::isq DEPENDENCIES mp-units::isq
HEADERS HEADERS include/units/isq/si/absorbed_dose.h
include/units/isq/si/absorbed_dose.h include/units/isq/si/acceleration.h
include/units/isq/si/acceleration.h include/units/isq/si/amount_of_substance.h
include/units/isq/si/amount_of_substance.h include/units/isq/si/angular_velocity.h
include/units/isq/si/angular_velocity.h include/units/isq/si/area.h
include/units/isq/si/area.h include/units/isq/si/capacitance.h
include/units/isq/si/capacitance.h include/units/isq/si/catalytic_activity.h
include/units/isq/si/catalytic_activity.h include/units/isq/si/charge_density.h
include/units/isq/si/charge_density.h include/units/isq/si/concentration.h
include/units/isq/si/concentration.h include/units/isq/si/conductance.h
include/units/isq/si/conductance.h include/units/isq/si/constants.h
include/units/isq/si/constants.h include/units/isq/si/current_density.h
include/units/isq/si/current_density.h include/units/isq/si/density.h
include/units/isq/si/density.h include/units/isq/si/dynamic_viscosity.h
include/units/isq/si/dynamic_viscosity.h include/units/isq/si/electric_charge.h
include/units/isq/si/electric_charge.h include/units/isq/si/electric_current.h
include/units/isq/si/electric_current.h include/units/isq/si/electric_field_strength.h
include/units/isq/si/electric_field_strength.h include/units/isq/si/energy.h
include/units/isq/si/energy.h include/units/isq/si/energy_density.h
include/units/isq/si/energy_density.h include/units/isq/si/force.h
include/units/isq/si/force.h include/units/isq/si/frequency.h
include/units/isq/si/frequency.h include/units/isq/si/heat_capacity.h
include/units/isq/si/heat_capacity.h include/units/isq/si/inductance.h
include/units/isq/si/inductance.h include/units/isq/si/length.h
include/units/isq/si/length.h include/units/isq/si/luminance.h
include/units/isq/si/luminance.h include/units/isq/si/luminous_intensity.h
include/units/isq/si/luminous_intensity.h include/units/isq/si/magnetic_flux.h
include/units/isq/si/magnetic_flux.h include/units/isq/si/magnetic_induction.h
include/units/isq/si/magnetic_induction.h include/units/isq/si/mass.h
include/units/isq/si/mass.h include/units/isq/si/molar_energy.h
include/units/isq/si/molar_energy.h include/units/isq/si/momentum.h
include/units/isq/si/momentum.h include/units/isq/si/permeability.h
include/units/isq/si/permeability.h include/units/isq/si/permittivity.h
include/units/isq/si/permittivity.h include/units/isq/si/power.h
include/units/isq/si/power.h include/units/isq/si/prefixes.h
include/units/isq/si/prefixes.h include/units/isq/si/pressure.h
include/units/isq/si/pressure.h include/units/isq/si/radioactivity.h
include/units/isq/si/radioactivity.h include/units/isq/si/resistance.h
include/units/isq/si/resistance.h include/units/isq/si/si.h
include/units/isq/si/si.h include/units/isq/si/speed.h
include/units/isq/si/speed.h include/units/isq/si/surface_tension.h
include/units/isq/si/surface_tension.h include/units/isq/si/thermal_conductivity.h
include/units/isq/si/thermal_conductivity.h include/units/isq/si/thermodynamic_temperature.h
include/units/isq/si/thermodynamic_temperature.h include/units/isq/si/time.h
include/units/isq/si/time.h include/units/isq/si/torque.h
include/units/isq/si/torque.h include/units/isq/si/voltage.h
include/units/isq/si/voltage.h include/units/isq/si/volume.h
include/units/isq/si/volume.h
) )