Skip to content

Commit 784a5c2

Browse files
committed
lint: Apply linter again
1 parent 8592ef1 commit 784a5c2

File tree

6 files changed

+34
-38
lines changed

6 files changed

+34
-38
lines changed

CMakeLists.txt

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if(POLICY CMP0167)
6767
set(CMAKE_POLICY_DEFAULT_CMP0167 NEW)
6868
endif()
6969
include(${JRL_CMAKE_MODULES}/base.cmake)
70-
compute_project_args(PROJECT_ARGS LANGUAGES CXX)
70+
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
7171
project(${PROJECT_NAME} ${PROJECT_ARGS})
7272
set(CMAKE_VERBOSE_MAKEFILE OFF)
7373

@@ -95,7 +95,7 @@ elseif(UNIX)
9595
endif()
9696
include(CMakeDependentOption)
9797

98-
apply_default_apple_configuration()
98+
APPLY_DEFAULT_APPLE_CONFIGURATION()
9999

100100
if(WIN32)
101101
set(LINK copy_if_different)
@@ -189,33 +189,29 @@ endif()
189189
# ----------------------------------------------------
190190
# --- DEPENDENCIES -----------------------------------
191191
# ----------------------------------------------------
192-
add_project_dependency(
192+
ADD_PROJECT_DEPENDENCY(
193193
Eigen3
194194
3.3.7
195195
REQUIRED
196196
PKG_CONFIG_REQUIRES "eigen3 >= 3.3.7"
197197
)
198-
add_project_dependency(
199-
fmt
200-
REQUIRED
201-
PKG_CONFIG_REQUIRES "fmt >= 10.0.0"
202-
)
198+
ADD_PROJECT_DEPENDENCY(fmt REQUIRED PKG_CONFIG_REQUIRES "fmt >= 10.0.0")
203199

204200
if(BUILD_WITH_OPENMP_SUPPORT)
205-
add_project_dependency(OpenMP REQUIRED)
201+
ADD_PROJECT_DEPENDENCY(OpenMP REQUIRED)
206202
add_compile_definitions(ALIGATOR_MULTITHREADING)
207203
endif()
208204

209205
set(BOOST_REQUIRED_COMPONENTS filesystem)
210-
set_boost_default_options()
211-
export_boost_default_options()
212-
add_project_dependency(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
206+
SET_BOOST_DEFAULT_OPTIONS()
207+
EXPORT_BOOST_DEFAULT_OPTIONS()
208+
ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
213209

214210
if(BUILD_WITH_PINOCCHIO_SUPPORT)
215211
message(STATUS "Building aligator with Pinocchio support.")
216212

217213
set(PINOCCHIO_MINIMUM_VERSION "3.4.0")
218-
add_project_dependency(
214+
ADD_PROJECT_DEPENDENCY(
219215
pinocchio
220216
${PINOCCHIO_MINIMUM_VERSION}
221217
REQUIRED
@@ -232,7 +228,7 @@ endif()
232228

233229
if(BUILD_PYTHON_INTERFACE)
234230
set(PYTHON_COMPONENTS Interpreter Development NumPy)
235-
add_project_dependency(
231+
ADD_PROJECT_DEPENDENCY(
236232
eigenpy
237233
3.9.0
238234
REQUIRED
@@ -313,7 +309,7 @@ if(ALIGATOR_TRACY_ENABLE AND DOWNLOAD_TRACY)
313309
endif()
314310
elseif(ALIGATOR_TRACY_ENABLE)
315311
# assume it is installed somewhere
316-
add_project_dependency(Tracy)
312+
ADD_PROJECT_DEPENDENCY(Tracy)
317313
if(NOT ${tracy_FOUND})
318314
message(
319315
FATAL_ERROR
@@ -385,12 +381,12 @@ function(create_library)
385381
endfunction()
386382

387383
if(BUILD_STANDALONE_PYTHON_INTERFACE)
388-
add_project_dependency(${PROJECT_NAME} REQUIRED CONFIG)
384+
ADD_PROJECT_DEPENDENCY(${PROJECT_NAME} REQUIRED CONFIG)
389385
else()
390386
create_library()
391387

392-
add_header_group(LIB_HEADERS)
393-
add_source_group(LIB_SOURCES)
388+
ADD_HEADER_GROUP(LIB_HEADERS)
389+
ADD_SOURCE_GROUP(LIB_SOURCES)
394390

395391
install(
396392
TARGETS ${PROJECT_NAME}
@@ -414,7 +410,7 @@ if(DOWNLOAD_TRACY)
414410
endif()
415411

416412
if(BUILD_CROCODDYL_COMPAT AND NOT BUILD_STANDALONE_PYTHON_INTERFACE)
417-
add_project_dependency(crocoddyl 3.0.1 REQUIRED)
413+
ADD_PROJECT_DEPENDENCY(crocoddyl 3.0.1 REQUIRED)
418414
add_subdirectory(src/compat/crocoddyl)
419415
endif()
420416

@@ -452,7 +448,7 @@ macro(create_ex_or_bench exfile exname)
452448
endmacro()
453449

454450
if(BUILD_WITH_PINOCCHIO_SUPPORT AND (BUILD_EXAMPLES OR BUILD_BENCHMARKS))
455-
add_project_private_dependency(example-robot-data 4.0.9 REQUIRED)
451+
ADD_PROJECT_PRIVATE_DEPENDENCY(example-robot-data 4.0.9 REQUIRED)
456452
endif()
457453

458454
# create an utility library to avoid recompiling crocoddyl talos arm problem
@@ -564,11 +560,11 @@ if(BUILD_WITH_OPENMP_SUPPORT)
564560
endif()
565561
if(BUILD_CROCODDYL_COMPAT)
566562
EXPORT_VARIABLE(ALIGATOR_WITH_CROCODDYL_COMPAT ON)
567-
pkg_config_append_libs(aligator_croc_compat)
563+
PKG_CONFIG_APPEND_LIBS(aligator_croc_compat)
568564
endif()
569565

570-
pkg_config_append_libs(${PROJECT_NAME})
571-
pkg_config_append_boost_libs(${BOOST_REQUIRED_COMPONENTS})
572-
pkg_config_append_cflags("${CFLAGS_DEPENDENCIES}")
566+
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
567+
PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_REQUIRED_COMPONENTS})
568+
PKG_CONFIG_APPEND_CFLAGS("${CFLAGS_DEPENDENCIES}")
573569

574-
setup_project_finalize()
570+
SETUP_PROJECT_FINALIZE()

bindings/python/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if(BUILD_CROCODDYL_COMPAT)
2929
endif()
3030

3131
function(make_bindings)
32-
python3_add_library(
32+
Python3_add_library(
3333
${PYLIB_NAME}
3434
MODULE
3535
WITH_SOABI
@@ -43,7 +43,7 @@ function(make_bindings)
4343
PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_NAME}
4444
)
4545
if(UNIX)
46-
get_relative_rpath(${${PYLIB_NAME}_INSTALL_DIR} PYLIB_INSTALL_RPATH)
46+
GET_RELATIVE_RPATH(${${PYLIB_NAME}_INSTALL_DIR} PYLIB_INSTALL_RPATH)
4747
set_target_properties(
4848
${PYLIB_NAME}
4949
PROPERTIES INSTALL_RPATH "${PYLIB_INSTALL_RPATH}"
@@ -90,12 +90,12 @@ else()
9090
endif()
9191
# --- GENERATE STUBS
9292
if(GENERATE_PYTHON_STUBS)
93-
python_build_get_target(python_build_target_name)
94-
load_stubgen()
93+
PYTHON_BUILD_GET_TARGET(python_build_target_name)
94+
LOAD_STUBGEN()
9595
# Set PYWRAP and PROJECT_NAME as stubs dependencies.
9696
# PROJECT_NAME is mandatory (even if it's a PYWRAP dependency)
9797
# to find PROJECT_NAME name DLL on windows.
98-
generate_stubs(
98+
GENERATE_STUBS(
9999
${CMAKE_CURRENT_BINARY_DIR}
100100
${PROJECT_NAME}
101101
${ABSOLUTE_PYTHON_SITELIB}
@@ -108,9 +108,9 @@ set(${PYLIB_NAME}_PYFILES __init__.py)
108108
set(${PYLIB_NAME}_PYFILES_UTILS __init__.py plotting.py)
109109

110110
foreach(pyfile ${${PYLIB_NAME}_PYFILES})
111-
python_install_on_site(${PROJECT_NAME} ${pyfile})
111+
PYTHON_INSTALL_ON_SITE(${PROJECT_NAME} ${pyfile})
112112
endforeach()
113113

114114
foreach(pyfile ${${PYLIB_NAME}_PYFILES_UTILS})
115-
python_install_on_site(${PROJECT_NAME}/utils ${pyfile})
115+
PYTHON_INSTALL_ON_SITE(${PROJECT_NAME}/utils ${pyfile})
116116
endforeach()

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if(NOT BUILD_STANDALONE_PYTHON_INTERFACE)
2929
endif()
3030

3131
if(BUILD_CROCODDYL_COMPAT)
32-
add_project_private_dependency(example-robot-data 4.0.9 REQUIRED)
32+
ADD_PROJECT_PRIVATE_DEPENDENCY(example-robot-data 4.0.9 REQUIRED)
3333
create_example(
3434
talos-arm.cpp
3535
DEPENDENCIES aligator::croc_compat croc_talos_arm_utils

extra-python-macros.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function(aligator_create_python_extension name)
1515
endforeach()
1616
set(_sources ${arg_UNPARSED_ARGUMENTS})
1717

18-
python3_add_library(${name} ${_parse_oneValueArgs} ${_sources})
18+
Python3_add_library(${name} ${_parse_oneValueArgs} ${_sources})
1919
target_link_libraries(${name} PRIVATE eigenpy::eigenpy aligator::aligator)
2020
target_compile_definitions(${name} PRIVATE PYTHON_MODULE_NAME=${name})
2121
endfunction()

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function(add_aligator_test2 test_name dependencies)
2121
set(test_name "${PROJECT_NAME}-test-cpp-${test_name}")
2222
message(STATUS "Adding cpp test: ${test_name} (${test_file})")
2323

24-
add_unit_test(${test_name} ${test_file} ${TEST_HEADERS})
24+
ADD_UNIT_TEST(${test_name} ${test_file} ${TEST_HEADERS})
2525
set_target_properties(${test_name} PROPERTIES LINKER_LANGUAGE CXX)
2626
set_standard_output_directory(${test_name})
2727
target_include_directories(${test_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

tests/python/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ foreach(pyfile ${PYTHON_TESTS})
3636
${CMAKE_CURRENT_BINARY_DIR}/${pyfile}
3737
)
3838
message(STATUS "Adding Python test: ${test_name}")
39-
add_python_unit_test(
39+
ADD_PYTHON_UNIT_TEST(
4040
${test_name}
4141
"tests/python/${pyfile}"
4242
"tests/python"
@@ -46,10 +46,10 @@ foreach(pyfile ${PYTHON_TESTS})
4646
endforeach()
4747

4848
function(add_test_binding_lib test_name)
49-
create_ctest_build_tests_target()
49+
CREATE_CTEST_BUILD_TESTS_TARGET()
5050

5151
set(target_name "${PROJECT_NAME}-${test_name}")
52-
python3_add_library(${target_name} MODULE "${test_name}.cpp")
52+
Python3_add_library(${target_name} MODULE "${test_name}.cpp")
5353
set_standard_output_directory(${target_name})
5454
target_link_libraries(${target_name} PUBLIC ${PYLIB_NAME})
5555
target_link_libraries(${target_name} PUBLIC eigenpy::eigenpy)

0 commit comments

Comments
 (0)