From ffd128548f198a37d198799ae3dba0b62d3c0f14 Mon Sep 17 00:00:00 2001
From: Radovan Bast <bast@users.noreply.github.com>
Date: Fri, 18 Sep 2015 09:34:46 +0200
Subject: [PATCH] more work on lapacke test

---
 test/cxx_lapacke/cmake/autocmake.cfg |  3 +++
 test/cxx_lapacke/src/CMakeLists.txt  | 19 +++++++++++++------
 test/cxx_lapacke/src/example.cpp     |  1 +
 test/test.py                         |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/test/cxx_lapacke/cmake/autocmake.cfg b/test/cxx_lapacke/cmake/autocmake.cfg
index fc8cc21..e1745b6 100644
--- a/test/cxx_lapacke/cmake/autocmake.cfg
+++ b/test/cxx_lapacke/cmake/autocmake.cfg
@@ -5,6 +5,9 @@ min_cmake_version: 2.8
 [cxx]
 source: ../../../modules/cxx.cmake
 
+[cblas]
+source: ../../../modules/cblas.cmake
+
 [lapacke]
 source: ../../../modules/lapacke.cmake
 
diff --git a/test/cxx_lapacke/src/CMakeLists.txt b/test/cxx_lapacke/src/CMakeLists.txt
index a53030c..5f8f3cd 100644
--- a/test/cxx_lapacke/src/CMakeLists.txt
+++ b/test/cxx_lapacke/src/CMakeLists.txt
@@ -1,7 +1,14 @@
-if(LAPACKE_FOUND)
-    include_directories(${LAPACKE_INCLUDE_DIR})
-    add_executable(example example.cpp)
-    target_link_libraries(example ${LAPACKE_LIBRARIES})
-else()
-    message(FATAL_ERROR "LAPACKE library not found")
+if(NOT CBLAS_FOUND)
+    message(FATAL_ERROR "CBLAS not found")
 endif()
+
+if(NOT LAPACKE_FOUND)
+    message(FATAL_ERROR "LAPACKE not found")
+endif()
+
+include_directories(${CBLAS_INCLUDE_DIR})
+include_directories(${LAPACKE_INCLUDE_DIR})
+
+add_executable(example example.cpp)
+
+target_link_libraries(example ${LAPACKE_LIBRARIES})
diff --git a/test/cxx_lapacke/src/example.cpp b/test/cxx_lapacke/src/example.cpp
index 7f05dd6..851cab5 100644
--- a/test/cxx_lapacke/src/example.cpp
+++ b/test/cxx_lapacke/src/example.cpp
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cblas.h"
 #include "lapacke.h"
 
 int main()
diff --git a/test/test.py b/test/test.py
index d549b8b..d27c21b 100644
--- a/test/test.py
+++ b/test/test.py
@@ -165,7 +165,7 @@ def test_fc_lapack():
 
 
 def test_cxx_lapacke():
-    configure_build_and_exe('cxx_lapacke', 'python setup.py --cxx=g++ --lapacke')
+    configure_build_and_exe('cxx_lapacke', 'python setup.py --cxx=g++ --lapacke --cblas')
 
 # ------------------------------------------------------------------------------