Skip to content

Commit 92291cb

Browse files
authored
Merge pull request #261 from dev-cafe/radovan/restore-ci
Remove Boost modules and tests and restore CI
2 parents 839beaa + 8c0222a commit 92291cb

File tree

21 files changed

+17
-419
lines changed

21 files changed

+17
-419
lines changed

.travis.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ matrix:
2525
- libopenmpi-dev
2626
# python library, development version
2727
- libpython2.7
28-
# boost
29-
- libboost-all-dev
3028

3129
- os: linux
3230
python: 3.5
@@ -49,20 +47,17 @@ matrix:
4947
- libopenmpi-dev
5048
# python library, development version
5149
- libpython2.7
52-
# boost
53-
- libboost-all-dev
5450

5551
- os: osx
56-
osx_image: xcode7.3
52+
osx_image: xcode11
5753
compiler: gcc
5854
env:
5955
- SOURCES=homebrew
6056

6157
install:
6258
- |
6359
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
64-
brew install cmake boost python open-mpi
65-
brew reinstall gcc
60+
brew update &> /dev/null
6661
pip install virtualenv
6762
elif [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
6863
pip install --user virtualenv
@@ -78,7 +73,7 @@ install:
7873
script:
7974
# pycodestyle tests
8075
- pycodestyle --ignore E501 update.py
81-
- pycodestyle --ignore E501,E265,E741 autocmake
76+
- pycodestyle --ignore E501,E265,E741 autocmake --exclude autocmake/external/docopt.py
8277
# unit tests
8378
- py.test -vv autocmake/*
8479
- py.test -vv test/test.py

modules/boost/boost.cmake

Lines changed: 0 additions & 192 deletions
This file was deleted.

modules/boost/boost_build.cmake

Lines changed: 0 additions & 13 deletions
This file was deleted.

modules/boost/boost_cleanup.cmake

Lines changed: 0 additions & 11 deletions
This file was deleted.

modules/boost/boost_configure.cmake

Lines changed: 0 additions & 15 deletions
This file was deleted.

modules/boost/boost_headers.cmake

Lines changed: 0 additions & 11 deletions
This file was deleted.

modules/boost/boost_install.cmake

Lines changed: 0 additions & 13 deletions
This file was deleted.

modules/boost/boost_unpack.cmake

Lines changed: 0 additions & 11 deletions
This file was deleted.

modules/boost/boost_userconfig.cmake

Lines changed: 0 additions & 18 deletions
This file was deleted.

modules/math/accelerate.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
option(ENABLE_ACCELERATE "Find and link to ACCELERATE" OFF)
2424

2525
if(ENABLE_ACCELERATE)
26-
include(find_libraries)
27-
include(find_include_files)
26+
include(${CMAKE_CURRENT_LIST_DIR}/../find/find_libraries.cmake)
27+
include(${CMAKE_CURRENT_LIST_DIR}/../find/find_include_files.cmake)
2828

2929
set(ACCELERATE_FOUND FALSE)
3030
set(ACCELERATE_LIBRARIES "NOTFOUND")

0 commit comments

Comments
 (0)