Merge pull request #261 from dev-cafe/radovan/restore-ci

Remove Boost modules and tests and restore CI
dev-cafe · Oct 7, 2019 · 92291cb · 92291cb
2 parents 839beaa + 8c0222a
commit 92291cb
Show file tree

Hide file tree

Showing 21 changed files with 17 additions and 419 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,8 +25,6 @@ matrix:
             - libopenmpi-dev
               # python library, development version
             - libpython2.7
-              # boost
-            - libboost-all-dev
 
     - os: linux
       python: 3.5
@@ -49,20 +47,17 @@ matrix:
             - libopenmpi-dev
               # python library, development version
             - libpython2.7
-              # boost
-            - libboost-all-dev
 
     - os: osx
-      osx_image: xcode7.3
+      osx_image: xcode11
       compiler: gcc
       env:
         - SOURCES=homebrew
 
 install:
   - |
     if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-        brew install cmake boost python open-mpi
-        brew reinstall gcc
+        brew update &> /dev/null
         pip install virtualenv
     elif [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
         pip install --user virtualenv
@@ -78,7 +73,7 @@ install:
 script:
     # pycodestyle tests
   - pycodestyle --ignore E501 update.py
-  - pycodestyle --ignore E501,E265,E741 autocmake
+  - pycodestyle --ignore E501,E265,E741 autocmake --exclude autocmake/external/docopt.py
     # unit tests
   - py.test -vv autocmake/*
   - py.test -vv test/test.py

diff --git a/modules/boost/boost.cmake b/modules/boost/boost.cmake
diff --git a/modules/boost/boost_build.cmake b/modules/boost/boost_build.cmake
diff --git a/modules/boost/boost_cleanup.cmake b/modules/boost/boost_cleanup.cmake
diff --git a/modules/boost/boost_configure.cmake b/modules/boost/boost_configure.cmake
diff --git a/modules/boost/boost_headers.cmake b/modules/boost/boost_headers.cmake
diff --git a/modules/boost/boost_install.cmake b/modules/boost/boost_install.cmake
diff --git a/modules/boost/boost_unpack.cmake b/modules/boost/boost_unpack.cmake
diff --git a/modules/boost/boost_userconfig.cmake b/modules/boost/boost_userconfig.cmake
diff --git a/modules/math/accelerate.cmake b/modules/math/accelerate.cmake
@@ -23,8 +23,8 @@
 option(ENABLE_ACCELERATE "Find and link to ACCELERATE" OFF)
 
 if(ENABLE_ACCELERATE)
-    include(find_libraries)
-    include(find_include_files)
+    include(${CMAKE_CURRENT_LIST_DIR}/../find/find_libraries.cmake)
+    include(${CMAKE_CURRENT_LIST_DIR}/../find/find_include_files.cmake)
 
     set(ACCELERATE_FOUND FALSE)
     set(ACCELERATE_LIBRARIES "NOTFOUND")

diff --git a/modules/math/cblas.cmake b/modules/math/cblas.cmake
@@ -23,8 +23,8 @@
 option(ENABLE_CBLAS "Find and link to CBLAS" OFF)
 
 if(ENABLE_CBLAS)
-    include(find_libraries)
-    include(find_include_files)
+    include(${CMAKE_CURRENT_LIST_DIR}/../find/find_libraries.cmake)
+    include(${CMAKE_CURRENT_LIST_DIR}/../find/find_include_files.cmake)
 
     set(CBLAS_FOUND FALSE)
     set(CBLAS_LIBRARIES "NOTFOUND")

diff --git a/modules/math/lapacke.cmake b/modules/math/lapacke.cmake
@@ -23,8 +23,8 @@
 option(ENABLE_LAPACKE "Find and link to LAPACKE" OFF)
 
 if(ENABLE_LAPACKE)
-    include(find_libraries)
-    include(find_include_files)
+    include(${CMAKE_CURRENT_LIST_DIR}/find_libraries.cmake)
+    include(${CMAKE_CURRENT_LIST_DIR}/find_include_files.cmake)
 
     set(LAPACKE_FOUND FALSE)
     set(LAPACKE_LIBRARIES "NOTFOUND")

diff --git a/test/boost_header_only/cmake/autocmake.yml b/test/boost_header_only/cmake/autocmake.yml
diff --git a/test/boost_header_only/src/CMakeLists.txt b/test/boost_header_only/src/CMakeLists.txt