diff --git a/CMakeLists.txt b/CMakeLists.txt index eca1f106..c799de5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,9 @@ else() cmake_policy(VERSION 3.27) endif() -if (NOT UNITS_CMAKE_PROJECT_NAME) +if(NOT UNITS_CMAKE_PROJECT_NAME) set(UNITS_CMAKE_PROJECT_NAME UNITS) - + endif() project( @@ -212,9 +212,6 @@ elseif(UNITS_ENABLE_TESTS) endif() endif() - - - if(UNITS_INSTALL) if(UNITS_BUILD_STATIC_LIBRARY) install(TARGETS compile_flags_target ${UNITS_LIBRARY_EXPORT_COMMAND}) @@ -222,7 +219,8 @@ if(UNITS_INSTALL) if(NOT UNITS_BINARY_ONLY_INSTALL) include(CMakePackageConfigHelpers) configure_file( - config/unitsConfig.cmake.in "${PROJECT_BINARY_DIR}/${UNITS_LC_PROJECT_NAME}Config.cmake" @ONLY + config/unitsConfig.cmake.in + "${PROJECT_BINARY_DIR}/${UNITS_LC_PROJECT_NAME}Config.cmake" @ONLY ) export( diff --git a/FuzzTargets/CMakeLists.txt b/FuzzTargets/CMakeLists.txt index cb7f4b27..d2943d66 100644 --- a/FuzzTargets/CMakeLists.txt +++ b/FuzzTargets/CMakeLists.txt @@ -6,11 +6,15 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ add_executable(fuzz_from_string fuzz_target_from_string.cpp) -target_link_libraries(fuzz_from_string ${UNITS_LC_PROJECT_NAME}::units compile_flags_target) +target_link_libraries( + fuzz_from_string ${UNITS_LC_PROJECT_NAME}::units compile_flags_target +) target_include_directories(fuzz_from_string PRIVATE ${CMAKE_SOURCE_DIR}/ThirdParty) add_executable(fuzz_measurement fuzz_target_measurement_from_string.cpp) -target_link_libraries(fuzz_measurement ${UNITS_LC_PROJECT_NAME}::units compile_flags_target) +target_link_libraries( + fuzz_measurement ${UNITS_LC_PROJECT_NAME}::units compile_flags_target +) target_include_directories(fuzz_measurement PRIVATE ${CMAKE_SOURCE_DIR}/ThirdParty) add_custom_target( diff --git a/converter/CMakeLists.txt b/converter/CMakeLists.txt index 3bdbbcf8..f6e74a2a 100644 --- a/converter/CMakeLists.txt +++ b/converter/CMakeLists.txt @@ -12,7 +12,9 @@ cmake_dependent_option( if(UNITS_BUILD_CONVERTER_APP) add_executable(units_convert converter.cpp) - target_link_libraries(units_convert PUBLIC ${UNITS_LC_PROJECT_NAME}::units compile_flags_target) + target_link_libraries( + units_convert PUBLIC ${UNITS_LC_PROJECT_NAME}::units compile_flags_target + ) target_include_directories(units_convert PRIVATE ${PROJECT_SOURCE_DIR}/ThirdParty) target_compile_definitions( units_convert PUBLIC UNITS_VERSION_STRING="${UNITS_VERSION}" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2f3dd3d9..e02b1a44 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -36,7 +36,9 @@ if(UNITS_HEADER_ONLY) foreach(T ${UNIT_TEST_HEADER_ONLY}) add_unit_test(${T}.cpp) - target_link_libraries(${T} ${UNITS_LC_PROJECT_NAME}::header_only compile_flags_target) + target_link_libraries( + ${T} ${UNITS_LC_PROJECT_NAME}::header_only compile_flags_target + ) if(MSVC) target_compile_options(${T} PRIVATE /wd4459) endif() @@ -68,7 +70,9 @@ else() ) add_unit_test(test_leadingNumbers.cpp) - target_link_libraries(test_leadingNumbers ${UNITS_LC_PROJECT_NAME}::units compile_flags_target) + target_link_libraries( + test_leadingNumbers ${UNITS_LC_PROJECT_NAME}::units compile_flags_target + ) if(UNITS_CLANG_TIDY) set_property(TARGET ${T} PROPERTY CXX_CLANG_TIDY "${DO_CLANG_TIDY}") endif() @@ -134,7 +138,8 @@ else() target_compile_options(test_all_unit_base PRIVATE /wd4459) endif() target_link_libraries( - test_all_unit_base gtest gmock gtest_main ${UNITS_LC_PROJECT_NAME}::units compile_flags_target + test_all_unit_base gtest gmock gtest_main ${UNITS_LC_PROJECT_NAME}::units + compile_flags_target ) set_target_properties(test_all_unit_base PROPERTIES FOLDER "Tests") # test_all_unit_base should not be added to the tests it will take a long time run diff --git a/units/CMakeLists.txt b/units/CMakeLists.txt index 6ca50614..ca7ef704 100644 --- a/units/CMakeLists.txt +++ b/units/CMakeLists.txt @@ -82,7 +82,9 @@ if(UNITS_BUILD_SHARED_LIBRARY) elseif(UNITS_BUILD_OBJECT_LIBRARY) add_library(units OBJECT ${units_source_files} ${units_header_files}) - target_include_directories(units PRIVATE $) + target_include_directories( + units PRIVATE $ + ) if(UNITS_NAMESPACE) target_compile_definitions(units PUBLIC -DUNITS_NAMESPACE=${UNITS_NAMESPACE}) @@ -146,7 +148,7 @@ elseif(UNITS_BUILD_STATIC_LIBRARY) set_property(TARGET units PROPERTY CXX_CLANG_TIDY "${DO_CLANG_TIDY}") endif() add_library(${UNITS_LC_PROJECT_NAME}::units ALIAS units) - message(status "adding library ${UNITS_LC_PROJECT_NAME}::units") + message(STATUS "adding library ${UNITS_LC_PROJECT_NAME}::units") endif() # add the header only interface library @@ -172,7 +174,9 @@ endif() add_library(${UNITS_LC_PROJECT_NAME}::header_only ALIAS header_only) if(UNITS_INSTALL AND NOT UNITS_BINARY_ONLY_INSTALL) - install(FILES ${units_header_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${UNITS_LC_PROJECT_NAME}) + install(FILES ${units_header_files} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${UNITS_LC_PROJECT_NAME} + ) if(UNITS_BUILD_SHARED_LIBRARY OR BUILD_SHARED_LIBS) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/units_export.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${UNITS_LC_PROJECT_NAME} diff --git a/webserver/CMakeLists.txt b/webserver/CMakeLists.txt index 53c55ec1..860ae066 100644 --- a/webserver/CMakeLists.txt +++ b/webserver/CMakeLists.txt @@ -19,7 +19,8 @@ if(CMAKE_VERSION VERSION_GREATER 3.12) find_package(Boost 1.70.0 REQUIRED) add_executable(units_webserver unit_web_server.cpp) target_link_libraries( - units_webserver PUBLIC ${UNITS_LC_PROJECT_NAME}::units compile_flags_target Boost::boost + units_webserver PUBLIC ${UNITS_LC_PROJECT_NAME}::units compile_flags_target + Boost::boost ) target_compile_definitions(units_webserver PUBLIC BOOST_DATE_TIME_NO_LIB)