Skip to content

Commit

Permalink
Migrate icub-firmware-shared, icub-main and human-dynamics-estimation…
Browse files Browse the repository at this point in the history
… conda packages to be installed via conda-forge



Bump CONDA_BUILD_NUMBER to 140
  • Loading branch information
traversaro authored Oct 1, 2024
1 parent 40b40e8 commit dcc4362
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 37 deletions.
8 changes: 2 additions & 6 deletions cmake/BuildHumanDynamicsEstimation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,5 @@ ycm_ep_helper(HumanDynamicsEstimation TYPE GIT
ICUB
robometry)

set(HumanDynamicsEstimation_CONDA_DEPENDENCIES eigen)

if(ROBOTOLOGY_USES_PYTHON)
list(APPEND HumanDynamicsEstimation_CONDA_DEPENDENCIES python)
list(APPEND HumanDynamicsEstimation_CONDA_DEPENDENCIES pybind11)
endif()
set(HumanDynamicsEstimation_CONDA_PKG_NAME human-dynamics-estimation)
set(HumanDynamicsEstimation_CONDA_PKG_CONDA_FORGE_OVERRIDE ON)
32 changes: 2 additions & 30 deletions cmake/BuildICUB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -104,33 +104,5 @@ ycm_ep_helper(ICUB TYPE GIT
-DCREATE_LUA:BOOL=${ROBOTOLOGY_USES_LUA}
${ICUB_PYTHON_INSTALL_CMAKE_ARGS})

set(ICUB_CONDA_DEPENDENCIES ace libopencv gsl ipopt libode qt-main sdl)
set(ICUB_CONDA_BUILD_DEPENDENCIES_EXPLICIT)

if(NOT (APPLE OR WIN32))
list(APPEND ICUB_CONDA_DEPENDENCIES libdc1394)
endif()

if(NOT APPLE)
list(APPEND ICUB_CONDA_DEPENDENCIES freeglut)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND ICUB_CONDA_DEPENDENCIES libglu)
endif()

if(ROBOTOLOGY_USES_ESDCAN)
list(APPEND ICUB_CONDA_DEPENDENCIES esdcan)
endif()

if(ICUB_COMPILE_BINDINGS)
list(APPEND ICUB_CONDA_BUILD_DEPENDENCIES_EXPLICIT swig)
endif()

if(ROBOTOLOGY_USES_PYTHON)
list(APPEND ICUB_CONDA_DEPENDENCIES python)
endif()

if(ROBOTOLOGY_USES_LUA)
list(APPEND ICUB_CONDA_DEPENDENCIES lua)
endif()

set(ICUB_CONDA_PKG_NAME icub-main)
set(ICUB_CONDA_PKG_CONDA_FORGE_OVERRIDE ON)
3 changes: 3 additions & 0 deletions cmake/Buildicub_firmware_shared.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ ycm_ep_helper(icub_firmware_shared TYPE GIT
COMPONENT iCub
FOLDER src
DEPENDS YCM)

set(icub_firmware_shared_CONDA_PKG_NAME icub-firmware-shared)
set(icub_firmware_shared_CONDA_PKG_CONDA_FORGE_OVERRIDE ON)
2 changes: 1 addition & 1 deletion conda/cmake/CondaGenerationOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# to ensure that binaries belonging to different rebuilds
# can be distinguished even if the version number is the same
if(NOT CONDA_BUILD_NUMBER)
set(CONDA_BUILD_NUMBER 133)
set(CONDA_BUILD_NUMBER 140)
endif()

# This option is enabled only when the metapackages robotology-distro and robotology-distro-all are
Expand Down

0 comments on commit dcc4362

Please sign in to comment.