mirror of
https://github.com/Naios/continuable.git
synced 2026-01-01 03:12:12 +08:00
Set the minimum required CMake version to 3.11
* Make travis-ci install a recent CMake version * Update function2
This commit is contained in:
parent
49e3a659ad
commit
fcf9a76029
@ -17,8 +17,6 @@ matrix:
|
||||
packages:
|
||||
- g++-6
|
||||
- valgrind
|
||||
- cmake
|
||||
- cmake-data
|
||||
- ninja-build
|
||||
env:
|
||||
- COMPILER=g++-6
|
||||
@ -35,8 +33,6 @@ matrix:
|
||||
- llvm-toolchain-trusty-5.0
|
||||
packages:
|
||||
- clang-5.0
|
||||
- cmake
|
||||
- cmake-data
|
||||
- ninja-build
|
||||
env:
|
||||
- COMPILER=clang++-5.0
|
||||
@ -53,8 +49,6 @@ matrix:
|
||||
- llvm-toolchain-trusty-5.0
|
||||
packages:
|
||||
- clang-5.0
|
||||
- cmake
|
||||
- cmake-data
|
||||
- ninja-build
|
||||
env:
|
||||
- COMPILER=clang++-5.0
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
cmake_minimum_required(VERSION 3.2)
|
||||
cmake_minimum_required(VERSION 3.11)
|
||||
project(continuable VERSION 3.0.0 LANGUAGES C CXX)
|
||||
|
||||
if (NOT CTI_CONTINUABLE_IS_FIND_INCLUDED)
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 5d227e6d5abd67bb618bed8b6221574b93a52248
|
||||
Subproject commit 5112fc3e8ca3042ebd37fbafbe69ee4cadb8b075
|
||||
@ -1,4 +1,15 @@
|
||||
#!/bin/bash -e
|
||||
# Install some dependencies manually
|
||||
DEPS_DIR="${HOME}/deps"
|
||||
mkdir -p ${DEPS_DIR}
|
||||
cd ${DEPS_DIR}
|
||||
|
||||
# Recent CMake:
|
||||
CMAKE_URL="https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz"
|
||||
mkdir cmake && wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
|
||||
export PATH=${DEPS_DIR}/cmake/bin:${PATH}
|
||||
cmake --version
|
||||
|
||||
############################################################################
|
||||
# Install libc++ and libc++abi if needed
|
||||
# Taken from here: https://github.com/boostorg/hana/blob/master/.travis.yml
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user