Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
submodules: recursive

- uses: prefix-dev/setup-pixi@v0.9.3
- uses: prefix-dev/setup-pixi@v0.9.6
with:
cache: true
environments: all
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/macos-linux-pixi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ jobs:
key: ccache-macos-linux-pixi-${{ matrix.os }}-${{ matrix.build_type }}-${{ github.sha }}
restore-keys: ccache-macos-linux-pixi-${{ matrix.os }}-${{ matrix.build_type }}-

- uses: prefix-dev/setup-pixi@v0.9.4
- uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.67.0
cache: true
environments: ${{ matrix.environment }}

Expand Down Expand Up @@ -89,7 +88,7 @@ jobs:
# with:
# submodules: recursive

# - uses: prefix-dev/setup-pixi@v0.9.3
# - uses: prefix-dev/setup-pixi@v0.9.6
# env:
# CMAKE_BUILD_PARALLEL_LEVEL: 2
# with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_pixi_lockfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
persist-credentials: false

- name: Set up pixi
uses: prefix-dev/setup-pixi@v0.9.3
uses: prefix-dev/setup-pixi@v0.9.6
with:
run-install: false

Expand Down
46 changes: 23 additions & 23 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ if(POLICY CMP0167)
set(CMAKE_POLICY_DEFAULT_CMP0167 NEW)
endif()
include(${JRL_CMAKE_MODULES}/base.cmake)
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
compute_project_args(PROJECT_ARGS LANGUAGES CXX)
project(${PROJECT_NAME} ${PROJECT_ARGS})
set(CMAKE_VERBOSE_MAKEFILE OFF)

Expand Down Expand Up @@ -95,7 +95,7 @@ elseif(UNIX)
endif()
include(CMakeDependentOption)

APPLY_DEFAULT_APPLE_CONFIGURATION()
apply_default_apple_configuration()

if(WIN32)
set(LINK copy_if_different)
Expand Down Expand Up @@ -194,38 +194,38 @@ endif()
# ----------------------------------------------------
# --- DEPENDENCIES -----------------------------------
# ----------------------------------------------------
ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "Eigen3 >= 3.4.0")
ADD_PROJECT_DEPENDENCY(fmt REQUIRED PKG_CONFIG_REQUIRES "fmt >= 10.0.0")
add_project_dependency(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "Eigen3 >= 3.4.0")
add_project_dependency(fmt REQUIRED PKG_CONFIG_REQUIRES "fmt >= 10.0.0")
if(BUILD_WITH_UBUNTU_22_COMPATIBILITY)
set(
CMAKE_MODULE_PATH
${JRL_CMAKE_MODULES}/find-external/mimalloc
${CMAKE_MODULE_PATH}
)
ADD_PROJECT_DEPENDENCY(mimalloc REQUIRED FIND_EXTERNAL)
add_project_dependency(mimalloc REQUIRED FIND_EXTERNAL)
else()
ADD_PROJECT_DEPENDENCY(
add_project_dependency(
mimalloc
REQUIRED
PKG_CONFIG_REQUIRES "mimalloc >= 2.1.0"
)
endif()

if(BUILD_WITH_OPENMP_SUPPORT)
ADD_PROJECT_DEPENDENCY(OpenMP REQUIRED)
add_project_dependency(OpenMP REQUIRED)
add_compile_definitions(ALIGATOR_MULTITHREADING)
endif()

set(BOOST_REQUIRED_COMPONENTS filesystem)
SET_BOOST_DEFAULT_OPTIONS()
EXPORT_BOOST_DEFAULT_OPTIONS()
ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
set_boost_default_options()
export_boost_default_options()
add_project_dependency(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})

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

set(PINOCCHIO_MINIMUM_VERSION "3.4.0")
ADD_PROJECT_DEPENDENCY(
add_project_dependency(
pinocchio
${PINOCCHIO_MINIMUM_VERSION}
REQUIRED
Expand All @@ -250,7 +250,7 @@ endif()

if(BUILD_PYTHON_INTERFACE)
set(PYTHON_COMPONENTS Interpreter Development NumPy)
ADD_PROJECT_DEPENDENCY(
add_project_dependency(
eigenpy
3.10.2
REQUIRED
Expand Down Expand Up @@ -380,7 +380,7 @@ if(ALIGATOR_TRACY_ENABLE)
endif()
else()
# assume it is installed somewhere
ADD_PROJECT_DEPENDENCY(Tracy)
add_project_dependency(Tracy)
if(NOT ${Tracy_FOUND})
message(
FATAL_ERROR
Expand Down Expand Up @@ -466,12 +466,12 @@ function(create_library)
endfunction()

if(BUILD_STANDALONE_PYTHON_INTERFACE)
ADD_PROJECT_DEPENDENCY(${PROJECT_NAME} REQUIRED CONFIG)
add_project_dependency(${PROJECT_NAME} REQUIRED CONFIG)
else()
create_library()

ADD_HEADER_GROUP(LIB_HEADERS)
ADD_SOURCE_GROUP(LIB_SOURCES)
add_header_group(LIB_HEADERS)
add_source_group(LIB_SOURCES)

install(
TARGETS ${PROJECT_NAME}
Expand All @@ -495,7 +495,7 @@ if(DOWNLOAD_TRACY)
endif()

if(BUILD_CROCODDYL_COMPAT AND NOT BUILD_STANDALONE_PYTHON_INTERFACE)
ADD_PROJECT_DEPENDENCY(crocoddyl 3.0.1 REQUIRED)
add_project_dependency(crocoddyl 3.0.1 REQUIRED)
add_subdirectory(src/compat/crocoddyl)
endif()

Expand Down Expand Up @@ -533,7 +533,7 @@ macro(create_ex_or_bench exfile exname)
endmacro()

if(BUILD_WITH_PINOCCHIO_SUPPORT AND (BUILD_EXAMPLES OR BUILD_BENCHMARKS))
ADD_PROJECT_PRIVATE_DEPENDENCY(example-robot-data 4.0.9 REQUIRED)
add_project_private_dependency(example-robot-data 4.0.9 REQUIRED)
endif()

# create an utility library to avoid recompiling crocoddyl talos arm problem
Expand Down Expand Up @@ -645,11 +645,11 @@ if(BUILD_WITH_OPENMP_SUPPORT)
endif()
if(BUILD_CROCODDYL_COMPAT)
EXPORT_VARIABLE(ALIGATOR_WITH_CROCODDYL_COMPAT ON)
PKG_CONFIG_APPEND_LIBS(aligator_croc_compat)
pkg_config_append_libs(aligator_croc_compat)
endif()

PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_REQUIRED_COMPONENTS})
PKG_CONFIG_APPEND_CFLAGS("${CFLAGS_DEPENDENCIES}")
pkg_config_append_libs(${PROJECT_NAME})
pkg_config_append_boost_libs(${BOOST_REQUIRED_COMPONENTS})
pkg_config_append_cflags("${CFLAGS_DEPENDENCIES}")

SETUP_PROJECT_FINALIZE()
setup_project_finalize()
14 changes: 7 additions & 7 deletions bindings/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if(BUILD_CROCODDYL_COMPAT)
endif()

function(make_bindings)
Python3_add_library(
python3_add_library(
${PYLIB_NAME}
MODULE
WITH_SOABI
Expand All @@ -44,7 +44,7 @@ function(make_bindings)
PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_NAME}
)
if(UNIX)
GET_RELATIVE_RPATH(${${PYLIB_NAME}_INSTALL_DIR} PYLIB_INSTALL_RPATH)
get_relative_rpath(${${PYLIB_NAME}_INSTALL_DIR} PYLIB_INSTALL_RPATH)
set_target_properties(
${PYLIB_NAME}
PROPERTIES INSTALL_RPATH "${PYLIB_INSTALL_RPATH}"
Expand Down Expand Up @@ -91,12 +91,12 @@ else()
endif()
# --- GENERATE STUBS
if(GENERATE_PYTHON_STUBS)
PYTHON_BUILD_GET_TARGET(python_build_target_name)
LOAD_STUBGEN()
python_build_get_target(python_build_target_name)
load_stubgen()
# Set PYWRAP and PROJECT_NAME as stubs dependencies.
# PROJECT_NAME is mandatory (even if it's a PYWRAP dependency)
# to find PROJECT_NAME name DLL on windows.
GENERATE_STUBS(
generate_stubs(
${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_NAME}
${ABSOLUTE_PYTHON_SITELIB}
Expand All @@ -109,9 +109,9 @@ set(${PYLIB_NAME}_PYFILES __init__.py)
set(${PYLIB_NAME}_PYFILES_UTILS __init__.py plotting.py)

foreach(pyfile ${${PYLIB_NAME}_PYFILES})
PYTHON_INSTALL_ON_SITE(${PROJECT_NAME} ${pyfile})
python_install_on_site(${PROJECT_NAME} ${pyfile})
endforeach()

foreach(pyfile ${${PYLIB_NAME}_PYFILES_UTILS})
PYTHON_INSTALL_ON_SITE(${PROJECT_NAME}/utils ${pyfile})
python_install_on_site(${PROJECT_NAME}/utils ${pyfile})
endforeach()
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if(NOT BUILD_STANDALONE_PYTHON_INTERFACE)
endif()

if(BUILD_CROCODDYL_COMPAT)
ADD_PROJECT_PRIVATE_DEPENDENCY(example-robot-data 4.0.9 REQUIRED)
add_project_private_dependency(example-robot-data 4.0.9 REQUIRED)
create_example(
talos-arm.cpp
DEPENDENCIES aligator::croc_compat croc_talos_arm_utils
Expand Down
2 changes: 1 addition & 1 deletion extra-python-macros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function(aligator_create_python_extension name)
endforeach()
set(_sources ${arg_UNPARSED_ARGUMENTS})

Python3_add_library(${name} ${_parse_oneValueArgs} ${_sources})
python3_add_library(${name} ${_parse_oneValueArgs} ${_sources})
target_link_libraries(${name} PRIVATE eigenpy::eigenpy aligator::aligator)
target_compile_definitions(${name} PRIVATE PYTHON_MODULE_NAME=${name})
endfunction()
Loading
Loading