From 263b4205a01e128d6558152ab085ae7e6a39ef09 Mon Sep 17 00:00:00 2001 From: Fabian Poggenhans Date: Thu, 30 Jul 2020 13:21:14 +0200 Subject: [PATCH] Format files with new cmake-format version --- cmake/Modules/FindJsonCpp.cmake | 25 +++++++++++++++++-------- cmake/Modules/FindSuiteSparse.cmake | 6 ++++-- cmake/Modules/MrtTesting.cmake | 19 ++++++++++++++----- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/cmake/Modules/FindJsonCpp.cmake b/cmake/Modules/FindJsonCpp.cmake index 0533f6a..72c5ccd 100644 --- a/cmake/Modules/FindJsonCpp.cmake +++ b/cmake/Modules/FindJsonCpp.cmake @@ -90,15 +90,24 @@ if(jsoncpp_FOUND) TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_RELEASE RELEASE RELWITHDEBINFO MINSIZEREL NONE ${_jsoncpp_debug_fallback}) - set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELWITHDEBINFO RELEASE - MINSIZEREL NONE ${_jsoncpp_debug_fallback}) - set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_MINSIZEREL MINSIZEREL RELEASE RELWITHDEBINFO - NONE ${_jsoncpp_debug_fallback}) - set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_NONE NONE RELEASE RELWITHDEBINFO MINSIZEREL - ${_jsoncpp_debug_fallback}) + set_property( + TARGET ${target} + APPEND + PROPERTY MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELWITHDEBINFO RELEASE MINSIZEREL NONE + ${_jsoncpp_debug_fallback}) + set_property( + TARGET ${target} + APPEND + PROPERTY MAP_IMPORTED_CONFIG_MINSIZEREL MINSIZEREL RELEASE RELWITHDEBINFO NONE ${_jsoncpp_debug_fallback}) + set_property( + TARGET ${target} + APPEND + PROPERTY MAP_IMPORTED_CONFIG_NONE NONE RELEASE RELWITHDEBINFO MINSIZEREL ${_jsoncpp_debug_fallback}) if(NOT MSVC) - set_property(TARGET ${target} APPEND PROPERTY MAP_IMPORTED_CONFIG_DEBUG DEBUG RELWITHDEBINFO RELEASE - MINSIZEREL NONE) + set_property( + TARGET ${target} + APPEND + PROPERTY MAP_IMPORTED_CONFIG_DEBUG DEBUG RELWITHDEBINFO RELEASE MINSIZEREL NONE) endif() endmacro() if(__jsoncpp_have_jsoncpplib) diff --git a/cmake/Modules/FindSuiteSparse.cmake b/cmake/Modules/FindSuiteSparse.cmake index 81fddf4..840e26b 100644 --- a/cmake/Modules/FindSuiteSparse.cmake +++ b/cmake/Modules/FindSuiteSparse.cmake @@ -484,8 +484,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND SUITESPARSE_VERSION VERSION_EQUAL 3.4.0 # Any even moderately recent Ubuntu release (likely to be affected by # this bug) should have lsb_release, if it isn't present we are likely # on a different Linux distribution (should be fine). - execute_process(COMMAND ${LSB_RELEASE_EXECUTABLE} -si OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID - OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process( + COMMAND ${LSB_RELEASE_EXECUTABLE} -si + OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID + OUTPUT_STRIP_TRAILING_WHITESPACE) if(LSB_DISTRIBUTOR_ID MATCHES "Ubuntu" AND SUITESPARSE_LIBRARIES MATCHES "/usr/lib/libamd") # We are on Ubuntu, and the SuiteSparse version matches the broken diff --git a/cmake/Modules/MrtTesting.cmake b/cmake/Modules/MrtTesting.cmake index f56dd74..9e228ba 100644 --- a/cmake/Modules/MrtTesting.cmake +++ b/cmake/Modules/MrtTesting.cmake @@ -66,7 +66,7 @@ function(mrt_init_testing) if(CMAKE_VERSION VERSION_GREATER "3.12") include(ProcessorCount) - processorcount(cores) + ProcessorCount(cores) set(make_jobs "--parallel ${cores}") endif() @@ -152,7 +152,10 @@ function(mrt_add_gtest target file) if(MRT_ENABLE_COVERAGE) set(coverage_arg COVERAGE_DIR ${MRT_COVERAGE_DIR}/${target}) endif() - _mrt_run_test(${target} ${ARG_WORKING_DIRECTORY} ${result_xml_path} ${coverage_arg} COMMAND ${cmd}) + _mrt_run_test( + ${target} ${ARG_WORKING_DIRECTORY} ${result_xml_path} + ${coverage_arg} + COMMAND ${cmd}) endfunction() function(mrt_add_rostest target launch_file) @@ -173,7 +176,10 @@ function(mrt_add_rostest target launch_file) get_filename_component(test_name ${launch_file} NAME_WE) # rostest appends "rostest-" to the file name. This behaviour is apparently undocumented... set(result_xml_path "${MRT_TEST_RESULTS_DIR}/${PROJECT_NAME}/rostest-${test_name}.xml") - _mrt_run_test(${target} ${CMAKE_CURRENT_BINARY_DIR} ${result_xml_path} ${coverage_arg} COMMAND ${cmd}) + _mrt_run_test( + ${target} ${CMAKE_CURRENT_BINARY_DIR} ${result_xml_path} + ${coverage_arg} + COMMAND ${cmd}) endfunction() function(mrt_add_rostest_gtest target launch_file cpp_file) @@ -243,8 +249,11 @@ function(_mrt_add_nosetests_impl folder) set(cmd "${NOSETESTS} -P --process-timeout=${_nose_TIMEOUT} ${tests} --with-xunit --xunit-file=\"${result_xml_path}\" ${covarg}" ) - _mrt_run_test(${test_name} ${CMAKE_CURRENT_LIST_DIR} ${result_xml_path} ${coverage_arg} - COMMAND ${cmd} ${cover_dir_arg} REDIRECT_STDERR) + _mrt_run_test( + ${test_name} ${CMAKE_CURRENT_LIST_DIR} ${result_xml_path} + ${coverage_arg} + COMMAND ${cmd} ${cover_dir_arg} + REDIRECT_STDERR) if(ARG_DEPENDS) add_dependencies(tests_{PROJECT_NAME} ${ARG_DEPENDS}) endif()