Update install_debian.sh

robotology · Nov 7, 2019 · 14fa9d9 · 14fa9d9
1 parent 3445a9a
commit 14fa9d9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.ci/install_debian.sh b/.ci/install_debian.sh
@@ -7,7 +7,7 @@ apt-get update
 export DEBIAN_FRONTEND=noninteractive
 
 # CI specific packages
-apt-get install -y clang valgrind ccache
+apt-get install -y clang valgrind ccache ninja-build
 
 # Core dependencies
 apt-get install -y libeigen3-dev build-essential cmake cmake-curses-gui coinor-libipopt-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libtinyxml-dev libace-dev libedit-dev libgsl0-dev libopencv-dev libode-dev liblua5.1-dev lua5.1 git swig qtbase5-dev qtdeclarative5-dev qtmultimedia5-dev qml-module-qtquick2 qml-module-qtquick-window2 qml-module-qtmultimedia qml-module-qtquick-dialogs qml-module-qtquick-controls qml-module-qt-labs-folderlistmodel qml-module-qt-labs-settings libsdl1.2-dev libxml2-dev

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,16 +23,16 @@ jobs:
         include:
           - os: ubuntu-latest
             build_type: Debug
-            cmake_generator: "Unix Makefiles"
+            cmake_generator: "Ninja"
           - os: ubuntu-latest
             build_type: Release
-            cmake_generator: "Ninja"
+            cmake_generator: "Unix Makefiles"
           - os: macOS-10.14
             build_type: Debug
-            cmake_generator: "Ninja"
+            cmake_generator: "Unix Makefiles"
           - os: macOS-10.14
             build_type: Release
-            cmake_generator: "Unix Makefiles"
+            cmake_generator: "Xcode"
 
     steps:
     - uses: actions/checkout@master
@@ -59,13 +59,17 @@ jobs:
     - name: Dependencies [MacOS]
       if: matrix.os == 'macOS-10.14'
       run: |
+        cmake --version
         brew cask install xquartz
         # Core dependencies 
         brew install ace boost cmake eigen gsl ipopt jpeg libedit opencv@3 pkg-config qt5 sqlite swig tinyxml
         # ROBOTOLOGY_ENABLE_DYNAMICS dependencies 
-        brew install matio
+        brew install libmatio
         # ROBOTOLOGY_USES_GAZEBO dependencies 
         brew install osrf/simulation/gazebo10
+        # CI-specific dependencies 
+        brew install ninja
+        cmake --version
 
     # ===================
     # CMAKE-BASED PROJECT
@@ -78,7 +82,8 @@ jobs:
         mkdir -p build
         cd build    
         # Note: HUMAN_DYNAMICS is temporary disabled as a workaround for https://github.com/robotology/wearables/issues/56
-        cmake -G"${{ matrix.cmake_generator }}" -DROBOTOLOGY_USES_GAZEBO:BOOL=ON -DROBOTOLOGY_USES_OCTAVE:BOOL=ON -DROBOTOLOGY_USES_PYTHON:BOOL=ON  -DROBOTOLOGY_ENABLE_DYNAMICS:BOOL=ON -DROBOTOLOGY_ENABLE_HUMAN_DYNAMICS:BOOL=OFF -DROBOTOLOGY_ENABLE_ICUB_HEAD:BOOL=ON -DNON_INTERACTIVE_BUILD:BOOL=TRUE -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
+        # Octave is disabled as a workaround for https://github.com/robotology-playground/yarp-matlab-bindings/pull/43
+        cmake -G"${{ matrix.cmake_generator }}" -DROBOTOLOGY_USES_GAZEBO:BOOL=ON -DROBOTOLOGY_USES_OCTAVE:BOOL=OFF -DROBOTOLOGY_USES_PYTHON:BOOL=ON  -DROBOTOLOGY_ENABLE_DYNAMICS:BOOL=ON -DROBOTOLOGY_ENABLE_HUMAN_DYNAMICS:BOOL=OFF -DROBOTOLOGY_ENABLE_ICUB_HEAD:BOOL=ON -DNON_INTERACTIVE_BUILD:BOOL=TRUE -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
 
     - name: Build
       shell: bash

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,7 +112,12 @@ endif()
 # Bootstrap YCM
 set(YCM_FOLDER robotology)
 set(YCM_COMPONENT core)
-set(YCM_TAG v0.10.4)
+# Temporary fix for https://github.com/robotology/ycm/issues/290
+if("${CMAKE_GENERATOR}" MATCHES "Ninja" OR ("${CMAKE_GENERATOR}" MATCHES "Xcode"))
+    set(YCM_TAG 6f7cc07c97d9016de5bbdeba13eeb93bd4bc8b65)
+else()
+    set(YCM_TAG v0.10.4)
+endif()
 set(YCM_MINIMUM_VERSION 0.10.4)
 include(YCMBootstrap)