From bb4dacedc191d07a400981dc2ed17e90bd45e0c9 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 18 Jan 2024 10:13:35 +0100 Subject: [PATCH] Test casadi PR3540 --- .github/workflows/ci.yml | 2 +- cmake/Buildcasadi.cmake | 4 ++-- cmake/ProjectsTagsStable.cmake | 2 +- cmake/ProjectsTagsUnstable.cmake | 2 +- doc/cmake-options.md | 2 +- doc/conda-forge.md | 2 +- releases/latest.releases.yaml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b7d5e6d8..1456ac9ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: # Dependencies mamba install ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz==8.* gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json pcl vtk opencv portaudio qt-main sdl sdl2 sqlite tinyxml spdlog lua soxr cmake compilers make ninja pkg-config tomlplusplus libzlib ffmpeg # Python - mamba install python numpy swig==4.1.0 pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad + mamba install python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad # Additional dependencies useful only on Linux - name: Dependencies [Conda/Linux] diff --git a/cmake/Buildcasadi.cmake b/cmake/Buildcasadi.cmake index cfb687812..3f7bdf874 100644 --- a/cmake/Buildcasadi.cmake +++ b/cmake/Buildcasadi.cmake @@ -28,8 +28,8 @@ endif() ycm_ep_helper(casadi TYPE GIT STYLE GITHUB - REPOSITORY casadi/casadi.git - TAG 3.6.3 + REPOSITORY wsfulton/casadi.git + TAG swig-4.2-python-strings COMPONENT external FOLDER src CMAKE_ARGS -DWITH_IPOPT:BOOL=ON diff --git a/cmake/ProjectsTagsStable.cmake b/cmake/ProjectsTagsStable.cmake index 6aece1a34..510e8ee94 100644 --- a/cmake/ProjectsTagsStable.cmake +++ b/cmake/ProjectsTagsStable.cmake @@ -11,7 +11,7 @@ set_tag(manif_TAG 0.0.4.103) set_tag(qhull_TAG 2020.2) set_tag(CppAD_TAG 20230000.0) set_tag(proxsuite_TAG v0.4.1) -set_tag(casadi_TAG 3.6.3) +set_tag(casadi_TAG swig-4.2-python-strings) set_tag(casadi-matlab-bindings_TAG v3.6.3.0) # Robotology projects diff --git a/cmake/ProjectsTagsUnstable.cmake b/cmake/ProjectsTagsUnstable.cmake index 11deceb80..5630e1a84 100644 --- a/cmake/ProjectsTagsUnstable.cmake +++ b/cmake/ProjectsTagsUnstable.cmake @@ -11,7 +11,7 @@ set_tag(manif_TAG 0.0.4.103) set_tag(qhull_TAG 2020.2) set_tag(CppAD_TAG 20230000.0) set_tag(proxsuite_TAG v0.4.1) -set_tag(casadi_TAG 3.6.3) +set_tag(casadi_TAG swig-4.2-python-strings) set_tag(casadi-matlab-bindings_TAG v3.6.3.0) # Robotology projects diff --git a/doc/cmake-options.md b/doc/cmake-options.md index 238e23109..91872489c 100644 --- a/doc/cmake-options.md +++ b/doc/cmake-options.md @@ -341,7 +341,7 @@ sudo bash ./scripts/install_apt_python_dependencies.sh #### Conda To install python and the other required dependencies when using `conda-forge` provided dependencies, use: ~~~ -mamba install -c conda-forge python numpy swig==4.1.0 pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython +mamba install -c conda-forge python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython ~~~ ### Check the installation diff --git a/doc/conda-forge.md b/doc/conda-forge.md index 5224b1822..aa4d024a4 100644 --- a/doc/conda-forge.md +++ b/doc/conda-forge.md @@ -163,7 +163,7 @@ For some [profile](doc/cmake-options.md#profile-cmake-options) or [dependency](d To install python and the other required dependencies when using `conda-forge` provided dependencies, use: ~~~ -mamba install -c conda-forge python numpy "swig==4.1.0" pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad +mamba install -c conda-forge python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad ~~~ #### `ROBOTOLOGY_USES_PCL_AND_VTK` diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index 619afc89b..519c1d88e 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -21,8 +21,8 @@ repositories: version: 20230000.0 casadi: type: git - url: https://github.com/casadi/casadi.git - version: 3.6.3 + url: https://github.com/wsfulton/casadi.git + version: swig-4.2-python-strings YCM: type: git url: https://github.com/robotology/ycm.git