From 6017dbbfa6007b6215f975494046d18a10bc9029 Mon Sep 17 00:00:00 2001
From: Radovan Bast <bast@users.noreply.github.com>
Date: Thu, 17 Sep 2015 10:24:07 +0200
Subject: [PATCH] renames

---
 test/cxx_cblas/src/CMakeLists.txt                             | 2 +-
 test/cxx_cblas/src/{example.cxx => example.cpp}               | 0
 test/{cc_lapacke => cxx_lapacke}/cmake/autocmake.cfg          | 4 ++--
 test/{cc_lapacke => cxx_lapacke}/src/CMakeLists.txt           | 4 ++--
 .../{cc_lapacke/src/example.c => cxx_lapacke/src/example.cpp} | 0
 test/test.py                                                  | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename test/cxx_cblas/src/{example.cxx => example.cpp} (100%)
 rename test/{cc_lapacke => cxx_lapacke}/cmake/autocmake.cfg (84%)
 rename test/{cc_lapacke => cxx_lapacke}/src/CMakeLists.txt (79%)
 rename test/{cc_lapacke/src/example.c => cxx_lapacke/src/example.cpp} (100%)

diff --git a/test/cxx_cblas/src/CMakeLists.txt b/test/cxx_cblas/src/CMakeLists.txt
index 8cbabba..b2fa27f 100644
--- a/test/cxx_cblas/src/CMakeLists.txt
+++ b/test/cxx_cblas/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 if(CBLAS_FOUND)
     include_directories(${CBLAS_INCLUDE_DIR})
-    add_executable(example example.cxx)
+    add_executable(example example.cpp)
     target_link_libraries(example ${CBLAS_LIBRARIES})
 else()
     message(FATAL_ERROR "CBLAS library not found")
diff --git a/test/cxx_cblas/src/example.cxx b/test/cxx_cblas/src/example.cpp
similarity index 100%
rename from test/cxx_cblas/src/example.cxx
rename to test/cxx_cblas/src/example.cpp
diff --git a/test/cc_lapacke/cmake/autocmake.cfg b/test/cxx_lapacke/cmake/autocmake.cfg
similarity index 84%
rename from test/cc_lapacke/cmake/autocmake.cfg
rename to test/cxx_lapacke/cmake/autocmake.cfg
index c715391..293159b 100644
--- a/test/cc_lapacke/cmake/autocmake.cfg
+++ b/test/cxx_lapacke/cmake/autocmake.cfg
@@ -2,8 +2,8 @@
 name: example
 min_cmake_version: 2.8
 
-[cc]
-source: ../../../modules/cc.cmake
+[cxx]
+source: ../../../modules/cxx.cmake
 
 [math_libs]
 source: ../../../modules/math_libs.cmake
diff --git a/test/cc_lapacke/src/CMakeLists.txt b/test/cxx_lapacke/src/CMakeLists.txt
similarity index 79%
rename from test/cc_lapacke/src/CMakeLists.txt
rename to test/cxx_lapacke/src/CMakeLists.txt
index 0565d47..bc44c1e 100644
--- a/test/cc_lapacke/src/CMakeLists.txt
+++ b/test/cxx_lapacke/src/CMakeLists.txt
@@ -1,12 +1,12 @@
 if(LAPACK_FOUND)
     if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    #windows needs to find <lapacke.h> of openblas 
+    #windows needs to find <lapacke.h> of openblas
         include_directories($ENV{PATH})
     else()
     #ftravis-ci needs find <clapack.h> of ATLAS
         include_directories(/usr/include/atlas)
     endif()
-    add_executable(example example.c)
+    add_executable(example example.cpp)
     target_link_libraries(example ${MATH_LIBS})
 else()
     message(FATAL_ERROR "LAPACK library not found for the test cc_lapacke!")
diff --git a/test/cc_lapacke/src/example.c b/test/cxx_lapacke/src/example.cpp
similarity index 100%
rename from test/cc_lapacke/src/example.c
rename to test/cxx_lapacke/src/example.cpp
diff --git a/test/test.py b/test/test.py
index b83cba0..cc6d921 100644
--- a/test/test.py
+++ b/test/test.py
@@ -165,8 +165,8 @@ def test_fc_lapack():
 
 
 @skip_on_osx
-def test_cc_lapacke():
-    configure_build_and_exe('cc_lapacke', 'python setup.py --cc=gcc --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
+def test_cxx_lapacke():
+    configure_build_and_exe('cxx_lapacke', 'python setup.py --cxx=g++ --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
 
 # ------------------------------------------------------------------------------