coffee/continuable
1
0
Fork 0
mirror of https://github.com/Naios/continuable.git synced 2026-02-16 23:29:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set the minimum required CMake version to 3.11

Browse Source 
* Make travis-ci install a recent CMake version
* Update function2
This commit is contained in:
Denis Blank 2018-12-10 17:37:25 +01:00
parent 49e3a659ad
commit fcf9a76029
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -17,8 +17,6 @@ matrix:
packages: packages:
- g++-6 - g++-6
- valgrind - valgrind
- cmake
- cmake-data
- ninja-build - ninja-build
env: env:
- COMPILER=g++-6 - COMPILER=g++-6
@ -35,8 +33,6 @@ matrix:
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-5.0
packages: packages:
- clang-5.0 - clang-5.0
- cmake
- cmake-data
- ninja-build - ninja-build
env: env:
- COMPILER=clang++-5.0 - COMPILER=clang++-5.0
@ -53,8 +49,6 @@ matrix:
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-5.0
packages: packages:
- clang-5.0 - clang-5.0
- cmake
- cmake-data
- ninja-build - ninja-build
env: env:
- COMPILER=clang++-5.0 - COMPILER=clang++-5.0

2
CMakeLists.txt
View File

@ -19,7 +19,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.11)
project(continuable VERSION 3.0.0 LANGUAGES C CXX) project(continuable VERSION 3.0.0 LANGUAGES C CXX)
if (NOT CTI_CONTINUABLE_IS_FIND_INCLUDED) if (NOT CTI_CONTINUABLE_IS_FIND_INCLUDED)

2
dep/function2/function2

@ -1 +1 @@
Subproject commit 5d227e6d5abd67bb618bed8b6221574b93a52248 Subproject commit 5112fc3e8ca3042ebd37fbafbe69ee4cadb8b075

11
tools/travis-ci.sh
View File

@ -1,4 +1,15 @@
#!/bin/bash -e #!/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 # Install libc++ and libc++abi if needed
# Taken from here: https://github.com/boostorg/hana/blob/master/.travis.yml # Taken from here: https://github.com/boostorg/hana/blob/master/.travis.yml