Skip to content

Commit ca55922

Browse files
authored
Merge pull request #245 from Simple-Robotics/topic/update-pixi
Update pixi lockfile
2 parents 42d281f + 7cd9f43 commit ca55922

File tree

4 files changed

+3327
-1721
lines changed

4 files changed

+3327
-1721
lines changed

CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ set(DOXYGEN_HTML_STYLESHEET "")
7070
# by CMake
7171
if(POLICY CMP0167)
7272
cmake_policy(SET CMP0167 NEW)
73+
# find_package(SDFormat14) reset this policy (with cmake_minimum_required) and redefine the find_dependency macro.
74+
# Then, futur call of this macro don't use the right version of this policy.
75+
# To avoid that, we define the CMP0167 default value.
76+
set(CMAKE_POLICY_DEFAULT_CMP0167 NEW)
7377
endif()
7478
include(${JRL_CMAKE_MODULES}/base.cmake)
7579
compute_project_args(PROJECT_ARGS LANGUAGES CXX)

build_scripts/pixi/activation.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ export ALIGATOR_PINOCCHIO_SUPPORT=${ALIGATOR_PINOCCHIO_SUPPORT:=OFF}
3737
export ALIGATOR_CROCODDYL_COMPAT=${ALIGATOR_CROCODDYL_COMPAT:=OFF}
3838
export ALIGATOR_OPENMP_SUPPORT=${ALIGATOR_OPENMP_SUPPORT:=OFF}
3939
export ALIGATOR_CHOLMOD_SUPPORT=${ALIGATOR_CHOLMOD_SUPPORT:=OFF}
40-
export ALIGATOR_BENCHMARK=${ALIGATOR_BENCHMARK:=ON}
40+
export ALIGATOR_BENCHMARKS=${ALIGATOR_BENCHMARKS:=ON}
4141
export ALIGATOR_EXAMPLES=${ALIGATOR_EXAMPLES:=ON}
4242
export ALIGATOR_PYTHON_STUBS=${ALIGATOR_PYTHON_STUBS:=ON}

0 commit comments

Comments
 (0)