From 36dc15d7a2258ab4cee74eb237ef0ede1279205a Mon Sep 17 00:00:00 2001 From: ManifoldFR Date: Tue, 17 Dec 2024 14:00:35 +0100 Subject: [PATCH 1/2] pre-commit config : add submodules checkout --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1fbd8976..9ed2a588 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,7 @@ ci: autoupdate_branch: main autofix_prs: false + submodules: true repos: - repo: https://github.com/pre-commit/mirrors-clang-format rev: v19.1.4 From 6fb997a1d0db22e5f4e4c3da2615486b166c5efa Mon Sep 17 00:00:00 2001 From: ManifoldFR Date: Tue, 17 Dec 2024 14:01:07 +0100 Subject: [PATCH 2/2] gersemi : add definitions from our CMake listfiles + jrl-cmakemodules + format all CMake files --- .gersemirc | 1 + CMakeLists.txt | 12 ++++++------ bindings/CMakeLists.txt | 13 ++++++++----- tests/CMakeLists.txt | 6 +++--- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gersemirc b/.gersemirc index 0becbb8f..2dd82834 100644 --- a/.gersemirc +++ b/.gersemirc @@ -1,3 +1,4 @@ +definitions: [./CMakeLists.txt, ./benchmark, ./bindings, ./cmake, ./tests] line_length: 80 indent: 2 warn_about_unknown_commands: false diff --git a/CMakeLists.txt b/CMakeLists.txt index af408d88..00340b8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ include("${JRL_CMAKE_MODULES}/base.cmake") include("${JRL_CMAKE_MODULES}/boost.cmake") # Project definition -compute_project_args(PROJECT_ARGS LANGUAGES CXX) +COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) project(${PROJECT_NAME} ${PROJECT_ARGS}) add_compile_options(-Wno-error) @@ -93,11 +93,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) endif() find_package(example-robot-data 4.0.9 REQUIRED) -add_project_dependency(OpenMP REQUIRED) -add_project_dependency(proxsuite REQUIRED) -add_project_dependency(pinocchio REQUIRED) -add_project_dependency(aligator REQUIRED) -add_project_dependency(ndcurves REQUIRED) +ADD_PROJECT_DEPENDENCY(OpenMP REQUIRED) +ADD_PROJECT_DEPENDENCY(proxsuite REQUIRED) +ADD_PROJECT_DEPENDENCY(pinocchio REQUIRED) +ADD_PROJECT_DEPENDENCY(aligator REQUIRED) +ADD_PROJECT_DEPENDENCY(ndcurves REQUIRED) # Main Library file(GLOB mpc_SOURCE CONFIGURE_DEPENDS src/*.cpp) diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index c363204b..5c6f8a1d 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -1,7 +1,7 @@ include("${JRL_CMAKE_MODULES}/python.cmake") include("${JRL_CMAKE_MODULES}/stubs.cmake") -add_project_dependency(eigenpy 3.9.1 REQUIRED) +ADD_PROJECT_DEPENDENCY(eigenpy 3.9.1 REQUIRED) set( ${PY_NAME}_SOURCES @@ -28,12 +28,15 @@ install(TARGETS ${PY_NAME}_pywrap DESTINATION ${${PY_NAME}_INSTALL_DIR}) set(${PY_NAME}_PYTHON __init__.py) foreach(python ${${PY_NAME}_PYTHON}) - python_install_on_site(${PY_NAME} ${python}) + PYTHON_INSTALL_ON_SITE(${PY_NAME} ${python}) endforeach() if(GENERATE_PYTHON_STUBS) - load_stubgen() - generate_stubs(${CMAKE_CURRENT_BINARY_DIR} simple_mpc ${PYTHON_SITELIB} - ${PY_NAME}_pywrap + LOAD_STUBGEN() + GENERATE_STUBS( + ${CMAKE_CURRENT_BINARY_DIR} + simple_mpc + ${PYTHON_SITELIB} + ${PY_NAME}_pywrap ) endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0cc336d4..7dbebbbb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -30,7 +30,7 @@ function(_add_test_prototype name prefix dependencies) set(test_file ${name}.cpp) message(STATUS "Adding C++ test: ${test_file} (${test_name})") - add_unit_test(${test_name} ${test_file} ${TEST_HEADERS}) + ADD_UNIT_TEST(${test_name} ${test_file} ${TEST_HEADERS}) set_target_properties(${test_name} PROPERTIES LINKER_LANGUAGE CXX) # set_standard_output_directory(${test_name}) target_include_directories(${test_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) @@ -38,8 +38,8 @@ function(_add_test_prototype name prefix dependencies) set(MODULE_NAME "${name}Test") string(REGEX REPLACE "-" "_" MODULE_NAME ${MODULE_NAME}) - add_test_cflags(${test_name} "-DBOOST_TEST_DYN_LINK") - add_test_cflags(${test_name} "-DBOOST_TEST_MODULE=${MODULE_NAME}") + ADD_TEST_CFLAGS(${test_name} "-DBOOST_TEST_DYN_LINK") + ADD_TEST_CFLAGS(${test_name} "-DBOOST_TEST_MODULE=${MODULE_NAME}") target_link_libraries(${test_name} PUBLIC ${dependencies}) target_link_libraries(${test_name} PRIVATE Boost::unit_test_framework)