Skip to content
This repository was archived by the owner on Oct 6, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
79 changes: 39 additions & 40 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,15 @@ addons:
sources:
- ubuntu-toolchain-r-test
packages:
- python3

# python3-pip package is not available, use 'easy_install3':
# * https://github.com/travis-ci/apt-package-whitelist/issues/768
- python3-pip
- python3-setuptools # easy_install3
- binutils

# https://github.com/travis-ci-tester/travis-test-clang-cxx-11
- libstdc++-4.8-dev
- libstdc++-7-dev

# https://github.com/travis-ci-tester/travis-test-gcc-cxx-11
- g++-4.8
- g++-7

env:
global:
Expand All @@ -40,26 +38,27 @@ matrix:
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=clang-libstdcxx
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=gcc-4-8

# FIXME: https://travis-ci.org/ingenue/hunter/jobs/164859218
# - os: linux
# env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=android-ndk-r10e-api-19-armeabi-v7a-neon

# FIXME: https://travis-ci.org/ingenue/hunter/jobs/164859220
# - os: linux
# env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=analyze

# FIXME: https://travis-ci.org/ingenue/hunter/jobs/164859221
# - os: linux
# env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=sanitize-address

env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=clang-cxx14
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=clang-cxx14-pic
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=clang-fpic
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=clang-fpic-static-std
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=clang-fpic-static-std-cxx14
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=gcc-lto
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=gcc-7
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=gcc-7-cxx14-pic
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=sanitize-address
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=sanitize-leak

# FIXME: https://travis-ci.org/ingenue/hunter/jobs/164859223
# - os: linux
# env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=sanitize-thread
- os: linux
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=sanitize-thread

# }

Expand All @@ -70,37 +69,37 @@ matrix:
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=libcxx
- os: osx
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=clang-libstdcxx
- os: osx
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=osx-10-13-make-cxx14
- os: osx
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=osx-10-13-cxx14
- os: osx
env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=osx-10-11

# FIXME: https://travis-ci.org/ingenue/hunter/jobs/164878134
# - os: osx
# env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=ios-nocodesign-9-3

# FIXME: https://travis-ci.org/ingenue/hunter/jobs/164859218
# - os: osx
# env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=android-ndk-r10e-api-19-armeabi-v7a-neon

# FIXME: https://travis-ci.org/ingenue/hunter/jobs/164859220
# - os: osx
# env: PROJECT_DIR=examples/hdf5 TOOLCHAIN=analyze

# }

install:
# Info about OS
- uname -a

# Info about available disk space
- df -h $HOME

# Disable autoupdate
# * https://github.com/Homebrew/brew/blob/7d31a70373edae4d8e78d91a4cbc05324bebc3ba/Library/Homebrew/manpages/brew.1.md.erb#L202
- export HOMEBREW_NO_AUTO_UPDATE=1

# Install Python 3
- if [[ "`uname`" == "Darwin" ]]; then travis_retry brew upgrade python || echo "Ignoring failure..."; fi
- if [[ "`uname`" == "Darwin" ]]; then travis_retry brew install python3; fi

# Install Python package 'requests'
# 'easy_install3' is not installed by 'brew install python3' on OS X 10.9 Maverick
- if [[ "`uname`" == "Darwin" ]]; then pip3 install requests; fi
- if [[ "`uname`" == "Linux" ]]; then travis_retry easy_install3 --user requests==2.10.0; fi
- if [[ "`uname`" == "Darwin" ]]; then pip3 install gitpython; fi
- if [[ "`uname`" == "Linux" ]]; then travis_retry pip3 install --user requests; fi
- if [[ "`uname`" == "Linux" ]]; then travis_retry pip3 install --user gitpython; fi

# Install latest Polly toolchains and scripts
- wget https://github.com/ruslo/polly/archive/master.zip
- wget https://github.com/cpp-pm/polly/archive/master.zip
- unzip master.zip
- POLLY_ROOT="`pwd`/polly-master"
- export PATH="${POLLY_ROOT}/bin:${PATH}"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013-2016, Ruslan Baratov
Copyright (c) 2013-2018, Ruslan Baratov
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
7 changes: 0 additions & 7 deletions README.rst

This file was deleted.

135 changes: 103 additions & 32 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,63 +4,128 @@ environment:
global:
# This variable used only if '--upload' added to 'jenkins.py'
GITHUB_USER_PASSWORD:
secure: uW6WWlvCt7CRvvdO9ePjbymPcPNuV1C6HGF8u7Ey6EI=
secure: LNJ5FPxb7CPXpslLdb63M1Z2344XY5kxQOsnE1RQ6O+hslNqTHk7pvbS+YB5+05P

matrix:
# FIXME:
# * https://ci.appveyor.com/project/ingenue/hunter/build/1.0.1053/job/l4ud1nf8pbo11tkh
# - TOOLCHAIN: "default"
# PROJECT_DIR: examples\hdf5
#- TOOLCHAIN: "default"
# PROJECT_DIR: examples\hdf5
# HUNTER_BINARY_DIR: C:\__BIN
# HUNTER_ROOT: C:\.HUNTER

#- TOOLCHAIN: "ninja-vs-15-2017-win64-cxx17"
# PROJECT_DIR: examples\hdf5
# HUNTER_BINARY_DIR: C:\__BIN
# HUNTER_ROOT: C:\.HUNTER

#- TOOLCHAIN: "ninja-vs-15-2017-win64"
# PROJECT_DIR: examples\hdf5
# HUNTER_BINARY_DIR: C:\__BIN
# HUNTER_ROOT: C:\.HUNTER

- TOOLCHAIN: "ninja-vs-14-2015-win64"
PROJECT_DIR: examples\hdf5
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

- TOOLCHAIN: "ninja-vs-12-2013-win64"
PROJECT_DIR: examples\hdf5

- TOOLCHAIN: "nmake-vs-12-2013-win64"
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013

- TOOLCHAIN: "nmake-vs-15-2017-win64-cxx17"
PROJECT_DIR: examples\hdf5

- TOOLCHAIN: "nmake-vs-12-2013"
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

- TOOLCHAIN: "nmake-vs-15-2017-win64"
PROJECT_DIR: examples\hdf5

- TOOLCHAIN: "vs-10-2010"
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

- TOOLCHAIN: "nmake-vs-12-2013-win64"
PROJECT_DIR: examples\hdf5

- TOOLCHAIN: "vs-11-2012"
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013

- TOOLCHAIN: "nmake-vs-12-2013"
PROJECT_DIR: examples\hdf5

HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013

- TOOLCHAIN: "vs-12-2013-win64"
PROJECT_DIR: examples\hdf5

HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013

- TOOLCHAIN: "vs-12-2013-xp"
PROJECT_DIR: examples\hdf5

HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013

- TOOLCHAIN: "vs-12-2013"
PROJECT_DIR: examples\hdf5

HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013

# FIXME:
# * https://ci.appveyor.com/project/ingenue/hunter/build/1.0.1053/job/l4ud1nf8pbo11tkh
# - TOOLCHAIN: "vs-14-2015"
# PROJECT_DIR: examples\hdf5

- TOOLCHAIN: "vs-9-2008"
- TOOLCHAIN: "vs-14-2015"
PROJECT_DIR: examples\hdf5

- TOOLCHAIN: "mingw"
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

- TOOLCHAIN: "vs-14-2015-win64"
PROJECT_DIR: examples\hdf5

# FIXME:
# * https://ci.appveyor.com/project/ingenue/hunter/build/1.0.1053/job/mtnnis065ibe658y
# - TOOLCHAIN: "msys"
# PROJECT_DIR: examples\hdf5

HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

- TOOLCHAIN: "vs-15-2017"
PROJECT_DIR: examples\hdf5
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

- TOOLCHAIN: "vs-15-2017-win64"
PROJECT_DIR: examples\hdf5
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

- TOOLCHAIN: "vs-16-2019"
PROJECT_DIR: examples\hdf5
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

- TOOLCHAIN: "vs-16-2019-win64"
PROJECT_DIR: examples\hdf5
HUNTER_BINARY_DIR: C:\__BIN
HUNTER_ROOT: C:\.HUNTER
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

install:
# Python 3
- cmd: set PATH=C:\Python34-x64;C:\Python34-x64\Scripts;%PATH%

# Install Python package 'requests'
# Install Python package 'requests', 'gitpython'
- cmd: pip install requests
- cmd: pip install gitpython

# Install latest Polly toolchains and scripts
- cmd: appveyor DownloadFile https://github.com/ruslo/polly/archive/master.zip
- cmd: appveyor DownloadFile https://github.com/cpp-pm/polly/archive/master.zip
- cmd: 7z x master.zip
- cmd: set POLLY_ROOT=%cd%\polly-master

Expand All @@ -78,13 +143,19 @@ install:
# * http://stackoverflow.com/a/3870338/2288008
- cmd: set PATH=%PATH:C:\Program Files\Git\usr\bin;=%

# Use MinGW from Qt tools because version is higher
# * http://www.appveyor.com/docs/installed-software#qt
- cmd: set MINGW_PATH=C:\Qt\Tools\mingw492_32\bin
# Save git.exe in HUNTER_GIT_EXECUTABLE for upload
# * https://docs.hunter.sh/en/latest/reference/user-variables.html#hunter-git-executable
# Variable will be used in CMake so it's okay to use Unix style '/'
- cmd: set HUNTER_GIT_EXECUTABLE=C:/Program Files/Git/bin/git.exe

- cmd: set MINGW_PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin

# MSYS2 location
- cmd: set MSYS_PATH=C:\msys64\usr\bin

# Visual Studio 15 2017: Mimic behavior of older versions
- cmd: set VS150COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools

build_script:
- cmd: python .\jenkins.py

Expand Down
17 changes: 17 additions & 0 deletions cmake/Hunter
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,32 @@ else()
set(HUNTER_CMAKE_HUNTER_ 1)
endif()

if(CMAKE_VERSION VERSION_LESS "3.2")
message(
FATAL_ERROR
"At least CMake version 3.2 required for Hunter dependency management."
" Update CMake or set HUNTER_ENABLED to OFF."
)
endif()

option(HUNTER_ENABLED "Enable Hunter package manager support" ON)
option(HUNTER_STATUS_PRINT "Print working status" ON)
option(HUNTER_STATUS_DEBUG "Print a lot info" OFF)

set(
HUNTER_CONFIGURATION_TYPES
"Release;Debug"
CACHE
STRING
"Hunter configuration types"
)

### add cmake modules to search path
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/find")

include(hunter_add_package) # For user project
include(hunter_private_data) # For user project
include(hunter_initialize)

# Basic initialization - only check arguments of HunterGate. Further
Expand Down
Loading