From 3fb313437bab2bb8db1c1a58d75aaa49083764ee Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 1 Jun 2021 10:37:41 +0200 Subject: [PATCH] Disable ROBOTOLOGY_USES_MATLAB in vcpkg/Windows CI (#775) --- .github/workflows/ci.yml | 13 +------------ CHANGELOG.md | 1 + doc/cmake-options.md | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d25e44aef..291b68470 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -275,17 +275,6 @@ jobs: rm msdk_R2020a_mexmaci64.zip echo "GHA_Matlab_ROOT_DIR=${GITHUB_WORKSPACE}/msdk_R2020a_mexmaci64" >> $GITHUB_ENV echo "GHA_Matlab_MEX_EXTENSION=mexmaci64" >> $GITHUB_ENV - - - name: Install files to enable compilation of mex files [Windows] - shell: bash - if: contains(matrix.os, 'windows') - run: | - curl -L -O https://github.com/robotology/robotology-vcpkg-ports/releases/download/storage/msdk_R2020a_mexw64.zip - unzip msdk_R2020a_mexw64.zip - rm msdk_R2020a_mexw64.zip - echo "GHA_Matlab_ROOT_DIR=${GITHUB_WORKSPACE}/msdk_R2020a_mexw64" >> $GITHUB_ENV - echo "GHA_Matlab_MEX_EXTENSION=mexw64" >> $GITHUB_ENV - - name: Move robotology-superbuild in C under Windows if: contains(matrix.os, 'windows') @@ -427,7 +416,7 @@ jobs: mkdir -p build cd build # ROBOTOLOGY_ENABLE_TELEOPERATION is OFF as a workaround for https://github.com/robotology/robotology-superbuild/issues/472 - cmake -C ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR}/.ci/initial-cache.gh.cmake -A x64 -DCMAKE_TOOLCHAIN_FILE=C:/robotology/vcpkg/scripts/buildsystems/vcpkg.cmake -DYCM_EP_ADDITIONAL_CMAKE_ARGS:STRING="-DMatlab_ROOT_DIR:PATH=${GHA_Matlab_ROOT_DIR} -DMatlab_MEX_EXTENSION:STRING=${GHA_Matlab_MEX_EXTENSION}" -DROBOTOLOGY_USES_MATLAB:BOOL=ON -DYCM_BOOTSTRAP_VERBOSE=ON -DYCM_EP_INSTALL_DIR=C:/robotology/robotology -DNON_INTERACTIVE_BUILD:BOOL=TRUE -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ${{ matrix.project_tags_cmake_options }} .. + cmake -C ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR}/.ci/initial-cache.gh.cmake -A x64 -DCMAKE_TOOLCHAIN_FILE=C:/robotology/vcpkg/scripts/buildsystems/vcpkg.cmake -DROBOTOLOGY_USES_MATLAB:BOOL=OFF -DYCM_BOOTSTRAP_VERBOSE=ON -DYCM_EP_INSTALL_DIR=C:/robotology/robotology -DNON_INTERACTIVE_BUILD:BOOL=TRUE -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ${{ matrix.project_tags_cmake_options }} .. - name: Build [Ubuntu&macOS] diff --git a/CHANGELOG.md b/CHANGELOG.md index da6f3b9d7..dddb21fc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The format of this document is based on [Keep a Changelog](https://keepachangelo ### Removed - The `icub-gazebo` project was removed from the superbuild (https://github.com/robotology/robotology-superbuild/pull/646). +- The `ROBOTOLOGY_USES_MATLAB` is not enable in Windows/vcpkg installer. Windows binaries for MATLAB/Simulink projects are avalable in Windows/conda, including in the form of One-line installation script (https://github.com/robotology/robotology-superbuild/blob/master/doc/matlab-one-line-install.md, https://github.com/robotology/robotology-superbuild/pull/775). ## [2021.02] - 2021-02-25 diff --git a/doc/cmake-options.md b/doc/cmake-options.md index e7e25839c..1c57a8147 100644 --- a/doc/cmake-options.md +++ b/doc/cmake-options.md @@ -89,7 +89,7 @@ Not all options are supported on all platforms. The following table provides a r | `ROBOTOLOGY_ENABLE_EVENT_DRIVEN` | ✔️ | ✔️ | ❌ | ✔️ | ✔️ | ❌ | | `ROBOTOLOGY_USES_GAZEBO` | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | | `ROBOTOLOGY_USES_IGNITION` | ❌ | ❌ | ❌ | ✔️ | ❌ | ❌ | -| `ROBOTOLOGY_USES_MATLAB` | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | +| `ROBOTOLOGY_USES_MATLAB` | ✔️ | ✔️ | ❌ | ✔️ | ✔️ | ✔️ | | `ROBOTOLOGY_USES_OCTAVE` | ✔️ | ✔️ | ❌ | ❌ | ❌ | ❌ | | `ROBOTOLOGY_USES_PYTHON` | ✔️ | ❌ | ❌ | ✔️ | ✔️ | ✔️ | | `ROBOTOLOGY_USES_OCULUS_SDK` | ❌ | ❌ | ✔️ | ❌ | ❌ | ❌ |