Skip to content

Commit acbf970

Browse files
authored
Merge pull request #499 from epsilon-0/master
fix redundant install of cblas_test.h
2 parents 427e05b + 0095825 commit acbf970

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

CBLAS/include/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
set(CBLAS_INCLUDE cblas.h cblas_f77.h cblas_test.h)
1+
set(CBLAS_INCLUDE cblas.h cblas_f77.h)
22

33
file(COPY ${CBLAS_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
4+
5+
file(COPY cblas_test.h DESTINATION ${LAPACK_BINARY_DIR}/test_include)

CBLAS/testing/CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ set(ZTESTL3O c_zblas3.c c_z3chke.c auxiliary.c c_xerbla.c)
4848

4949

5050
if(BUILD_SINGLE)
51-
add_executable(xscblat1 c_sblat1.f ${STESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
52-
add_executable(xscblat2 c_sblat2.f ${STESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
53-
add_executable(xscblat3 c_sblat3.f ${STESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
51+
add_executable(xscblat1 c_sblat1.f ${STESTL1O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
52+
add_executable(xscblat2 c_sblat2.f ${STESTL2O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
53+
add_executable(xscblat3 c_sblat3.f ${STESTL3O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
5454

5555
target_link_libraries(xscblat1 ${CBLASLIB})
5656
target_link_libraries(xscblat2 ${CBLASLIB})
@@ -62,9 +62,9 @@ if(BUILD_SINGLE)
6262
endif()
6363

6464
if(BUILD_DOUBLE)
65-
add_executable(xdcblat1 c_dblat1.f ${DTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
66-
add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
67-
add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
65+
add_executable(xdcblat1 c_dblat1.f ${DTESTL1O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
66+
add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
67+
add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
6868

6969
target_link_libraries(xdcblat1 ${CBLASLIB})
7070
target_link_libraries(xdcblat2 ${CBLASLIB})
@@ -76,9 +76,9 @@ if(BUILD_DOUBLE)
7676
endif()
7777

7878
if(BUILD_COMPLEX)
79-
add_executable(xccblat1 c_cblat1.f ${CTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
80-
add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
81-
add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
79+
add_executable(xccblat1 c_cblat1.f ${CTESTL1O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
80+
add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
81+
add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
8282

8383
target_link_libraries(xccblat1 ${CBLASLIB} ${BLAS_LIBRARIES})
8484
target_link_libraries(xccblat2 ${CBLASLIB})
@@ -90,9 +90,9 @@ if(BUILD_COMPLEX)
9090
endif()
9191

9292
if(BUILD_COMPLEX16)
93-
add_executable(xzcblat1 c_zblat1.f ${ZTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
94-
add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
95-
add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
93+
add_executable(xzcblat1 c_zblat1.f ${ZTESTL1O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
94+
add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
95+
add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/test_include/cblas_test.h)
9696

9797
target_link_libraries(xzcblat1 ${CBLASLIB})
9898
target_link_libraries(xzcblat2 ${CBLASLIB})

0 commit comments

Comments
 (0)