From ce4471452796c20c30490a18d271cf21909995e6 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 10 Aug 2024 13:09:43 +0200 Subject: [PATCH] Fix support for building on Windows with Ninja (#1682) --- cmake/Buildosqp.cmake | 9 ++++++++- cmake/ProjectsTagsStable.cmake | 3 ++- cmake/ProjectsTagsUnstable.cmake | 3 ++- releases/latest.releases.yaml | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/cmake/Buildosqp.cmake b/cmake/Buildosqp.cmake index f39e7cdc5..97f9d0146 100644 --- a/cmake/Buildosqp.cmake +++ b/cmake/Buildosqp.cmake @@ -10,7 +10,14 @@ ycm_ep_helper(osqp TYPE GIT TAG master COMPONENT external FOLDER src - CMAKE_ARGS -DUNITTESTS:BOOL=OFF) + CMAKE_ARGS -DUNITTESTS:BOOL=OFF + -DOSQP_BUILD_STATIC_LIB:BOOL=OFF + -DQDLDL_BUILD_STATIC_LIB:BOOL=OFF) set(osqp_CONDA_PKG_NAME libosqp) set(osqp_CONDA_PKG_CONDA_FORGE_OVERRIDE ON) +# This is a small hack. To avoid incompatibilities between the version tagged in the robotology-dependencies fork +# (something like 0.6.3.x) and the version available in conda-forge when generating conda metapackages +# such as robotology-distro and robotology-distro-all, we override the conda package version of manif +# here. This needs to be removed as soon as we stop using our fork in the superbuild +set(osqp_CONDA_VERSION 0.6.3) diff --git a/cmake/ProjectsTagsStable.cmake b/cmake/ProjectsTagsStable.cmake index 44b540296..a835291d4 100644 --- a/cmake/ProjectsTagsStable.cmake +++ b/cmake/ProjectsTagsStable.cmake @@ -5,7 +5,8 @@ macro(set_tag tag_name tag_value) endmacro() # External projects -set_tag(osqp_TAG v0.6.3) +set_tag(osqp_REPOSITORY robotology-dependencies/osqp.git) +set_tag(osqp_TAG v0.6.3.1) set_tag(manif_REPOSITORY robotology-dependencies/manif.git) set_tag(manif_TAG 0.0.4.103) set_tag(qhull_TAG 2020.2) diff --git a/cmake/ProjectsTagsUnstable.cmake b/cmake/ProjectsTagsUnstable.cmake index 8a6c6e639..17897286f 100644 --- a/cmake/ProjectsTagsUnstable.cmake +++ b/cmake/ProjectsTagsUnstable.cmake @@ -5,7 +5,8 @@ macro(set_tag tag_name tag_value) endmacro() # External projects -set_tag(osqp_TAG v0.6.3) +set_tag(osqp_REPOSITORY robotology-dependencies/osqp.git) +set_tag(osqp_TAG v0.6.3.1) set_tag(manif_REPOSITORY robotology-dependencies/manif.git) set_tag(manif_TAG 0.0.4.103) set_tag(qhull_TAG 2020.2) diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index 571ffc1bb..ed99163a9 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -5,8 +5,8 @@ repositories: version: v3.2.0.1 osqp: type: git - url: https://github.com/oxfordcontrol/osqp.git - version: v0.6.3 + url: https://github.com/robotology-dependencies/osqp.git + version: v0.6.3.1 manif: type: git url: https://github.com/robotology-dependencies/manif.git