From 62dea9d36412f63a1a7c6552e699b6f07dd153c2 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Thu, 9 Feb 2023 10:00:38 +0100 Subject: [PATCH] Reformat CMake files --- .vscode/settings.json | 6 +- CMakeLists.txt | 8 +- extras/CompileOptions.cmake | 11 +-- extras/ci/espidf/main/CMakeLists.txt | 6 +- extras/fuzzing/CMakeLists.txt | 20 ++-- extras/tests/Cpp17/CMakeLists.txt | 2 +- extras/tests/Cpp20/CMakeLists.txt | 2 +- extras/tests/FailingBuilds/CMakeLists.txt | 20 ++-- extras/tests/IntegrationTests/CMakeLists.txt | 4 +- extras/tests/JsonArray/CMakeLists.txt | 2 +- extras/tests/JsonDeserializer/CMakeLists.txt | 2 +- extras/tests/JsonDocument/CMakeLists.txt | 2 +- extras/tests/JsonObject/CMakeLists.txt | 2 +- extras/tests/JsonSerializer/CMakeLists.txt | 2 +- extras/tests/JsonVariant/CMakeLists.txt | 2 +- extras/tests/MemoryPool/CMakeLists.txt | 4 +- extras/tests/Misc/CMakeLists.txt | 2 +- .../tests/MixedConfiguration/CMakeLists.txt | 2 +- .../tests/MsgPackDeserializer/CMakeLists.txt | 2 +- extras/tests/MsgPackSerializer/CMakeLists.txt | 2 +- extras/tests/Numbers/CMakeLists.txt | 3 +- extras/tests/TextFormatter/CMakeLists.txt | 4 +- extras/tests/catch/CMakeLists.txt | 2 +- src/CMakeLists.txt | 99 ++++++++++--------- 24 files changed, 104 insertions(+), 107 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ab96969e..731bad43 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,5 +10,9 @@ }, "C_Cpp.default.includePath": [ "/src" - ] + ], + "[cmake]": { + "editor.detectIndentation": false, + "editor.insertSpaces": false, + } } diff --git a/CMakeLists.txt b/CMakeLists.txt index f31fffef..c2a69002 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,15 +5,15 @@ cmake_minimum_required(VERSION 3.15) if(ESP_PLATFORM) - # Build ArduinoJson as an ESP-IDF component - idf_component_register(INCLUDE_DIRS src) - return() + # Build ArduinoJson as an ESP-IDF component + idf_component_register(INCLUDE_DIRS src) + return() endif() project(ArduinoJson VERSION 6.20.1) if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) - include(CTest) + include(CTest) endif() add_subdirectory(src) diff --git a/extras/CompileOptions.cmake b/extras/CompileOptions.cmake index 9eadfa6a..0cbd576c 100644 --- a/extras/CompileOptions.cmake +++ b/extras/CompileOptions.cmake @@ -27,11 +27,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") if(${COVERAGE}) set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage") endif() - endif() -if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8) AND (NOT ${COVERAGE})) +if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8) AND(NOT ${COVERAGE})) add_compile_options(-g -Og) else() add_compile_options(-g -O0) @@ -65,7 +64,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) AND (NOT ${COVERAGE})) + if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) AND(NOT ${COVERAGE})) add_compile_options(-g -Og) else() add_compile_options(-g -O0) @@ -73,7 +72,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") - if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) AND (NOT ${COVERAGE})) + if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) AND(NOT ${COVERAGE})) add_compile_options(-g -Og) else() add_compile_options(-g -O0) @@ -90,7 +89,7 @@ if(MSVC) endif() if(MINGW) - # Static link on MinGW to avoid linking with the wrong DLLs when multiple + # Static link on MinGW to avoid linking with the wrong DLLs when multiple # versions are installed. add_link_options(-static) endif() diff --git a/extras/ci/espidf/main/CMakeLists.txt b/extras/ci/espidf/main/CMakeLists.txt index f06bfda6..21633669 100644 --- a/extras/ci/espidf/main/CMakeLists.txt +++ b/extras/ci/espidf/main/CMakeLists.txt @@ -2,5 +2,7 @@ # Copyright © 2014-2022, Benoit BLANCHON # MIT License -idf_component_register(SRCS "main.cpp" - INCLUDE_DIRS "") +idf_component_register( + SRCS "main.cpp" + INCLUDE_DIRS "" +) diff --git a/extras/fuzzing/CMakeLists.txt b/extras/fuzzing/CMakeLists.txt index e5d6a36e..4800704d 100644 --- a/extras/fuzzing/CMakeLists.txt +++ b/extras/fuzzing/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(json_reproducer ArduinoJson ) -macro(add_fuzzer name) +macro(add_fuzzer name) set(FUZZER "${name}_fuzzer") set(CORPUS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${name}_corpus") set(SEED_CORPUS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${name}_seed_corpus") @@ -33,27 +33,23 @@ macro(add_fuzzer name) ArduinoJson ) set_target_properties("${FUZZER}" - PROPERTIES - COMPILE_FLAGS - "-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all" - LINK_FLAGS - "-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all" + PROPERTIES + COMPILE_FLAGS "-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all" + LINK_FLAGS "-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all" ) add_test( - NAME - "${FUZZER}" - COMMAND - "${FUZZER}" "${CORPUS_DIR}" "${SEED_CORPUS_DIR}" -max_total_time=5 -timeout=1 + NAME "${FUZZER}" + COMMAND "${FUZZER}" "${CORPUS_DIR}" "${SEED_CORPUS_DIR}" -max_total_time=5 -timeout=1 ) set_tests_properties("${FUZZER}" PROPERTIES - LABELS "Fuzzing" + LABELS "Fuzzing" ) endmacro() -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6) +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6) add_fuzzer(json) add_fuzzer(msgpack) endif() diff --git a/extras/tests/Cpp17/CMakeLists.txt b/extras/tests/Cpp17/CMakeLists.txt index 05af2007..1086bc24 100644 --- a/extras/tests/Cpp17/CMakeLists.txt +++ b/extras/tests/Cpp17/CMakeLists.txt @@ -25,5 +25,5 @@ add_test(Cpp17 Cpp17Tests) set_tests_properties(Cpp17 PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/Cpp20/CMakeLists.txt b/extras/tests/Cpp20/CMakeLists.txt index 2c9a72b0..a8d2582b 100644 --- a/extras/tests/Cpp20/CMakeLists.txt +++ b/extras/tests/Cpp20/CMakeLists.txt @@ -25,5 +25,5 @@ add_test(Cpp20 Cpp20Tests) set_tests_properties(Cpp20 PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/FailingBuilds/CMakeLists.txt b/extras/tests/FailingBuilds/CMakeLists.txt index 1ddab769..4973fd84 100644 --- a/extras/tests/FailingBuilds/CMakeLists.txt +++ b/extras/tests/FailingBuilds/CMakeLists.txt @@ -5,25 +5,21 @@ macro(build_should_fail target) set_target_properties(${target} PROPERTIES - EXCLUDE_FROM_ALL TRUE - EXCLUDE_FROM_DEFAULT_BUILD TRUE + EXCLUDE_FROM_ALL TRUE + EXCLUDE_FROM_DEFAULT_BUILD TRUE ) add_test( - NAME - ${target} - COMMAND - ${CMAKE_COMMAND} --build . --target ${target} --config $ - WORKING_DIRECTORY - ${CMAKE_BINARY_DIR} + NAME ${target} + COMMAND ${CMAKE_COMMAND} --build . --target ${target} --config $ + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) - set_tests_properties(${target} + set_tests_properties(${target} PROPERTIES - WILL_FAIL TRUE - LABELS "WillFail;Catch" + WILL_FAIL TRUE + LABELS "WillFail;Catch" ) endmacro() - add_executable(Issue978 Issue978.cpp) build_should_fail(Issue978) diff --git a/extras/tests/IntegrationTests/CMakeLists.txt b/extras/tests/IntegrationTests/CMakeLists.txt index 88b5ba68..be6d7935 100644 --- a/extras/tests/IntegrationTests/CMakeLists.txt +++ b/extras/tests/IntegrationTests/CMakeLists.txt @@ -12,7 +12,7 @@ add_executable(IntegrationTests if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") target_compile_options(IntegrationTests PUBLIC - -fsingle-precision-constant # issue 544 + -fsingle-precision-constant # issue 544 ) endif() @@ -20,5 +20,5 @@ add_test(IntegrationTests IntegrationTests) set_tests_properties(IntegrationTests PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/JsonArray/CMakeLists.txt b/extras/tests/JsonArray/CMakeLists.txt index 9f897992..5b5776de 100644 --- a/extras/tests/JsonArray/CMakeLists.txt +++ b/extras/tests/JsonArray/CMakeLists.txt @@ -24,5 +24,5 @@ add_test(JsonArray JsonArrayTests) set_tests_properties(JsonArray PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/JsonDeserializer/CMakeLists.txt b/extras/tests/JsonDeserializer/CMakeLists.txt index 429c3755..bd5fdf9a 100644 --- a/extras/tests/JsonDeserializer/CMakeLists.txt +++ b/extras/tests/JsonDeserializer/CMakeLists.txt @@ -24,5 +24,5 @@ add_test(JsonDeserializer JsonDeserializerTests) set_tests_properties(JsonDeserializer PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/JsonDocument/CMakeLists.txt b/extras/tests/JsonDocument/CMakeLists.txt index 781d128f..64422e2f 100644 --- a/extras/tests/JsonDocument/CMakeLists.txt +++ b/extras/tests/JsonDocument/CMakeLists.txt @@ -28,5 +28,5 @@ add_test(JsonDocument JsonDocumentTests) set_tests_properties(JsonDocument PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/JsonObject/CMakeLists.txt b/extras/tests/JsonObject/CMakeLists.txt index 033e73ea..ae78a97d 100644 --- a/extras/tests/JsonObject/CMakeLists.txt +++ b/extras/tests/JsonObject/CMakeLists.txt @@ -25,5 +25,5 @@ add_test(JsonObject JsonObjectTests) set_tests_properties(JsonObject PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/JsonSerializer/CMakeLists.txt b/extras/tests/JsonSerializer/CMakeLists.txt index ece6dbc2..d4b95298 100644 --- a/extras/tests/JsonSerializer/CMakeLists.txt +++ b/extras/tests/JsonSerializer/CMakeLists.txt @@ -18,5 +18,5 @@ add_test(JsonSerializer JsonSerializerTests) set_tests_properties(JsonSerializer PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/JsonVariant/CMakeLists.txt b/extras/tests/JsonVariant/CMakeLists.txt index 3f37a11b..c3fd5136 100644 --- a/extras/tests/JsonVariant/CMakeLists.txt +++ b/extras/tests/JsonVariant/CMakeLists.txt @@ -33,5 +33,5 @@ add_test(JsonVariant JsonVariantTests) set_tests_properties(JsonVariant PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/MemoryPool/CMakeLists.txt b/extras/tests/MemoryPool/CMakeLists.txt index 80ba3c6d..82fe064c 100644 --- a/extras/tests/MemoryPool/CMakeLists.txt +++ b/extras/tests/MemoryPool/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright © 2014-2022, Benoit BLANCHON # MIT License -add_executable(MemoryPoolTests +add_executable(MemoryPoolTests allocVariant.cpp clear.cpp saveString.cpp @@ -14,5 +14,5 @@ add_test(MemoryPool MemoryPoolTests) set_tests_properties(MemoryPool PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/Misc/CMakeLists.txt b/extras/tests/Misc/CMakeLists.txt index d567efbd..72068b00 100644 --- a/extras/tests/Misc/CMakeLists.txt +++ b/extras/tests/Misc/CMakeLists.txt @@ -25,5 +25,5 @@ add_test(Misc MiscTests) set_tests_properties(Misc PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/MixedConfiguration/CMakeLists.txt b/extras/tests/MixedConfiguration/CMakeLists.txt index 791a7a62..2b17dd85 100644 --- a/extras/tests/MixedConfiguration/CMakeLists.txt +++ b/extras/tests/MixedConfiguration/CMakeLists.txt @@ -29,5 +29,5 @@ add_test(MixedConfiguration MixedConfigurationTests) set_tests_properties(MixedConfiguration PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/MsgPackDeserializer/CMakeLists.txt b/extras/tests/MsgPackDeserializer/CMakeLists.txt index f2435279..f7477f03 100644 --- a/extras/tests/MsgPackDeserializer/CMakeLists.txt +++ b/extras/tests/MsgPackDeserializer/CMakeLists.txt @@ -20,5 +20,5 @@ add_test(MsgPackDeserializer MsgPackDeserializerTests) set_tests_properties(MsgPackDeserializer PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/MsgPackSerializer/CMakeLists.txt b/extras/tests/MsgPackSerializer/CMakeLists.txt index 9a7721e9..3349cb27 100644 --- a/extras/tests/MsgPackSerializer/CMakeLists.txt +++ b/extras/tests/MsgPackSerializer/CMakeLists.txt @@ -15,5 +15,5 @@ add_test(MsgPackSerializer MsgPackSerializerTests) set_tests_properties(MsgPackSerializer PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/Numbers/CMakeLists.txt b/extras/tests/Numbers/CMakeLists.txt index f7cf6616..5b9b4833 100644 --- a/extras/tests/Numbers/CMakeLists.txt +++ b/extras/tests/Numbers/CMakeLists.txt @@ -10,10 +10,9 @@ add_executable(NumbersTests parseNumber.cpp ) - add_test(Numbers NumbersTests) set_tests_properties(Numbers PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/TextFormatter/CMakeLists.txt b/extras/tests/TextFormatter/CMakeLists.txt index 57a3f85b..bcdf996d 100644 --- a/extras/tests/TextFormatter/CMakeLists.txt +++ b/extras/tests/TextFormatter/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright © 2014-2022, Benoit BLANCHON # MIT License -add_executable(TextFormatterTests +add_executable(TextFormatterTests writeFloat.cpp writeInteger.cpp writeString.cpp @@ -14,5 +14,5 @@ add_test(TextFormatter TextFormatterTests) set_tests_properties(TextFormatter PROPERTIES - LABELS "Catch" + LABELS "Catch" ) diff --git a/extras/tests/catch/CMakeLists.txt b/extras/tests/catch/CMakeLists.txt index 0129af11..c5fb5fb8 100644 --- a/extras/tests/catch/CMakeLists.txt +++ b/extras/tests/catch/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(catch target_include_directories(catch PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} ) if(MINGW) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebc83a95..66c181a4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,79 +12,80 @@ include(GNUInstallDirs) # Adding the install interface generator expression makes sure that the include # files are installed to the proper location (provided by GNUInstallDirs) target_include_directories(ArduinoJson - INTERFACE - $ - $ + INTERFACE + $ + $ ) target_compile_definitions(ArduinoJson - INTERFACE - ARDUINOJSON_DEBUG=$ + INTERFACE + ARDUINOJSON_DEBUG=$ ) # locations are provided by GNUInstallDirs install( - TARGETS - ArduinoJson - EXPORT - ArduinoJson_Targets - ARCHIVE DESTINATION - ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION - ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION - ${CMAKE_INSTALL_BINDIR} + TARGETS + ArduinoJson + EXPORT + ArduinoJson_Targets + ARCHIVE DESTINATION + ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION + ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION + ${CMAKE_INSTALL_BINDIR} ) include(CMakePackageConfigHelpers) -if(${CMAKE_VERSION} VERSION_GREATER "3.14.0") - set(ARCH_INDEPENDENT "ARCH_INDEPENDENT") +if(${CMAKE_VERSION} VERSION_GREATER "3.14.0") + set(ARCH_INDEPENDENT "ARCH_INDEPENDENT") endif() write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake" - VERSION - ${PROJECT_VERSION} - COMPATIBILITY - SameMajorVersion - ${ARCH_INDEPENDENT} + "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake" + VERSION + ${PROJECT_VERSION} + COMPATIBILITY + SameMajorVersion + ${ARCH_INDEPENDENT} ) configure_package_config_file( - "${PROJECT_SOURCE_DIR}/extras/ArduinoJsonConfig.cmake.in" - "${PROJECT_BINARY_DIR}/ArduinoJsonConfig.cmake" - INSTALL_DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake) - -install( - EXPORT - ArduinoJson_Targets - FILE - ArduinoJsonTargets.cmake - DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake + "${PROJECT_SOURCE_DIR}/extras/ArduinoJsonConfig.cmake.in" + "${PROJECT_BINARY_DIR}/ArduinoJsonConfig.cmake" + INSTALL_DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake ) install( - FILES - "${PROJECT_BINARY_DIR}/ArduinoJsonConfig.cmake" - "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake" - DESTINATION - "${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake" + EXPORT + ArduinoJson_Targets + FILE + ArduinoJsonTargets.cmake + DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake ) install( - FILES - ArduinoJson.h - ArduinoJson.hpp - DESTINATION - include + FILES + "${PROJECT_BINARY_DIR}/ArduinoJsonConfig.cmake" + "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake" + DESTINATION + "${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake" ) install( - DIRECTORY - "${CMAKE_CURRENT_SOURCE_DIR}/ArduinoJson" - DESTINATION - include + FILES + ArduinoJson.h + ArduinoJson.hpp + DESTINATION + include +) + +install( + DIRECTORY + "${CMAKE_CURRENT_SOURCE_DIR}/ArduinoJson" + DESTINATION + include )