mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-31 02:47:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: pre-commit cmake-format checks fixed

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
.cmake-format.yaml
View File

@ -11,6 +11,12 @@ parse:
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:

13
cmake/TestHeaders.cmake
View File

@ -80,10 +80,13 @@
# 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(
ARGS
"EXCLUDE_FROM_ALL" # options
"" # 1 value args "" # 1 value args
"HEADERS;EXCLUDE" # multivalued args "HEADERS;EXCLUDE" # multivalued args
${ARGN}) ${ARGN}
)
if(NOT ARGS_HEADERS) if(NOT ARGS_HEADERS)
message(FATAL_ERROR "The `HEADERS` argument must be provided.") message(FATAL_ERROR "The `HEADERS` argument must be provided.")
endif() endif()
@ -120,9 +123,7 @@ function(add_header_test target)
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()

1
cmake/TestPublicHeaders.cmake
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()

9
src/cmake/AddUnitsModule.cmake
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)

7
src/core-fmt/CMakeLists.txt
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)

7
src/core-io/CMakeLists.txt
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
)

4
src/core/CMakeLists.txt
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

16
src/systems/isq-iec80000/CMakeLists.txt
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
) )

9
src/systems/isq-natural/CMakeLists.txt
View File

@ -22,11 +22,10 @@
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

9
src/systems/isq/CMakeLists.txt
View File

@ -22,11 +22,10 @@
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

9
src/systems/si-cgs/CMakeLists.txt
View File

@ -22,11 +22,10 @@
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

10
src/systems/si-fps/CMakeLists.txt
View File

@ -22,11 +22,10 @@
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
@ -40,4 +39,3 @@ add_units_module(si-fps
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
) )

13
src/systems/si-hep/CMakeLists.txt
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
) )

8
src/systems/si-iau/CMakeLists.txt
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
) )

7
src/systems/si-imperial/CMakeLists.txt
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
HEADERS
include/units/isq/si/imperial/imperial.h
include/units/isq/si/imperial/length.h include/units/isq/si/imperial/length.h
) )

14
src/systems/si-international/CMakeLists.txt
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/length.h
include/units/isq/si/international/speed.h
include/units/isq/si/international/volume.h include/units/isq/si/international/volume.h
) )

8
src/systems/si-typographic/CMakeLists.txt
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
HEADERS
include/units/isq/si/typographic/length.h
include/units/isq/si/typographic/typographic.h include/units/isq/si/typographic/typographic.h
) )

9
src/systems/si-uscs/CMakeLists.txt
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
) )

9
src/systems/si/CMakeLists.txt
View File

@ -22,11 +22,10 @@
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