From 4676ca5cb66d3b8c4eda0edf0b6bb8ffff7e41cf Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 19 May 2021 16:08:42 +0200 Subject: [PATCH] revert to cmake minimum 3.10 --- snapcraft.yaml | 19 +------------------ src/CMakeLists.txt | 2 +- src/vcglib | 2 +- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 4c3f1d275..ced5a0837 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -28,29 +28,12 @@ apps: - mount-observe parts: - cmake: - source: https://github.com/Kitware/CMake - source-type: git - source-depth: 1 - plugin: cmake - stage-packages: - - libssl-dev - override-build: | - mkdir -p build - cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=$SNAPCRAFT_STAGE/cmake \ - $SNAPCRAFT_PART_SRC - make -j 4 - make install - meshlab: - after: [cmake] plugin: qmake qt-version: qt5 source: https://github.com/cnr-isti-vclab/meshlab.git build-packages: - #- cmake + - cmake - qt5-default - qttools5-dev-tools - qtdeclarative5-dev diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb359792c..22d8ad439 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2019, 2021, Visual Computing Lab, ISTI - Italian National Research Council # SPDX-License-Identifier: BSL-1.0 -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(MeshLab) ### Build options diff --git a/src/vcglib b/src/vcglib index c150c3f6b..5c0ea8b20 160000 --- a/src/vcglib +++ b/src/vcglib @@ -1 +1 @@ -Subproject commit c150c3f6b66edbb21e96d02d373af264b44afdc2 +Subproject commit 5c0ea8b20ea95adfc3a443ef60e02ee54057ec41