softfail if lapack not present

scivision · Dec 31, 2018 · c25907d · c25907d
1 parent 92fbc0c
commit c25907d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,7 @@ addons:
     sources: ubuntu-toolchain-r-test
     packages: 
     - gfortran-6
+    - liblapack-dev
    # - libopenmpi-dev
    # - openmpi-bin #goofed up travis network 
  #       - libhdf5-dev # old version

diff --git a/cmake/Modules/FindLAPACK95.cmake b/cmake/Modules/FindLAPACK95.cmake
@@ -51,7 +51,11 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
 
 elseif(USEMKL)  # MKL with non-Intel compiler
   set(BLA_F95 OFF)
-  find_package(LAPACK REQUIRED)
+  find_package(LAPACK)
+  if(NOT LAPACK_FOUND)
+    message(WARNING "Lapack is required for Lapack95")
+    return()
+  endif()
 
   find_path(LAPACK95_INCLUDE_DIR
             NAMES lapack95.mod
@@ -67,7 +71,11 @@ elseif(USEMKL)  # MKL with non-Intel compiler
 
 else() # Netlib
   set(BLA_F95 OFF)
-  find_package(LAPACK REQUIRED)
+  find_package(LAPACK)
+  if(NOT LAPACK_FOUND)
+    message(WARNING "Lapack is required for Lapack95")
+    return()
+  endif()
 
   find_path(LAPACK95_INCLUDE_DIR
             NAMES f95_lapack.mod