From 50b755ad07025db4993f619ef46c90c370762c8d Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 16 Jul 2024 10:18:04 +0200 Subject: [PATCH] Pass YCM_USE_CMAKE_NEXT set to OFF in normal-build (i.e. apt with gha image and vcpkg on windows) workflow and bump YCM to v0.16.5 (#1672) * Pass YCM_USE_CMAKE_NEXT set to OFF in normal-build workflow * Bump ycm-cmake-modules to 0.16.5 --- .github/workflows/ci.yml | 4 ++-- releases/latest.releases.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bcc8f326..2e41fedd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -379,7 +379,7 @@ jobs: cd ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR} mkdir -p build cd build - cmake -C ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR}/.ci/initial-cache.gh.cmake -G"${{ matrix.cmake_generator }}" -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 -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 -G"${{ matrix.cmake_generator }}" -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 -DNON_INTERACTIVE_BUILD:BOOL=TRUE -DYCM_USE_CMAKE_NEXT:BOOL=OFF -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ${{ matrix.project_tags_cmake_options }} .. - name: Configure [Windows] if: contains(matrix.os, 'windows') @@ -393,7 +393,7 @@ jobs: mkdir -p build cd build # ROBOTOLOGY_ENABLE_TELEOPERATION is OFF as it is unsupported on vcpkg - 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=Debug ${{ 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=Debug -DYCM_USE_CMAKE_NEXT:BOOL=OFF ${{ matrix.project_tags_cmake_options }} .. cmake -DROBOTOLOGY_ENABLE_TELEOPERATION:BOOL=OFF . - name: Disable options unsupported on Ubuntu 20.04 and vcpkg diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index 6f8db94c0..8dd0de8c9 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -26,7 +26,7 @@ repositories: YCM: type: git url: https://github.com/robotology/ycm.git - version: v0.16.4 + version: v0.16.5 YARP: type: git url: https://github.com/robotology/yarp.git