diff options
Diffstat (limited to 'academic/cblas/patches/target-cleanup.diff')
| -rw-r--r-- | academic/cblas/patches/target-cleanup.diff | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/academic/cblas/patches/target-cleanup.diff b/academic/cblas/patches/target-cleanup.diff index 8f15294374849..bed89f0ccdeeb 100644 --- a/academic/cblas/patches/target-cleanup.diff +++ b/academic/cblas/patches/target-cleanup.diff @@ -43,21 +43,6 @@ diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt add_library(blas ${ALLOBJ}) set_target_properties( blas PROPERTIES -diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt ---- a/CBLAS/CMakeLists.txt -+++ b/CBLAS/CMakeLists.txt -@@ -65,9 +65,9 @@ - list(GET ALL_TARGETS 0 _cblas_config_build_guard_target) - endif() - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-version.cmake.in -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in - ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY) --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in - ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY) - - diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt --- a/CBLAS/src/CMakeLists.txt +++ b/CBLAS/src/CMakeLists.txt @@ -180,7 +165,7 @@ diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt +if(BUILD_COMPLEX) + list(APPEND ALLOBJ ${CLEV1} ${SCLEV1} ${ERRHAND} ${CLEV2} ${CLEV3}) +endif() -+if(BUILD_COMPLEX16) ++if(BUILD_COMPLEX16) + list(APPEND ALLOBJ ${ZLEV1} ${DZLEV1} ${ERRHAND} ${ZLEV2} ${ZLEV3}) +endif() +list(REMOVE_DUPLICATES ALLOBJ) @@ -243,7 +228,7 @@ diff --git a/CBLAS/src/Makefile b/CBLAS/src/Makefile diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt --- a/CBLAS/testing/CMakeLists.txt +++ b/CBLAS/testing/CMakeLists.txt -@@ -28,8 +28,6 @@ +@@ -27,8 +27,6 @@ # Object files for single real precision SET( STESTL1O c_sblas1.c) @@ -252,7 +237,7 @@ diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt SET( STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c) SET( STESTL3O c_sblas3.c c_s3chke.c auxiliary.c c_xerbla.c) -@@ -62,11 +60,9 @@ +@@ -61,11 +59,9 @@ add_cblas_test(stest1.out "" xscblat1) add_cblas_test(stest2.out sin2 xscblat2) add_cblas_test(stest3.out sin3 xscblat3) @@ -264,7 +249,7 @@ diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt add_executable(xdcblat1 c_dblat1.f ${DTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) -@@ -78,11 +74,9 @@ +@@ -77,11 +73,9 @@ add_cblas_test(dtest1.out "" xdcblat1) add_cblas_test(dtest2.out din2 xdcblat2) add_cblas_test(dtest3.out din3 xdcblat3) @@ -276,7 +261,7 @@ diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt add_executable(xccblat1 c_cblat1.f ${CTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) -@@ -94,11 +88,9 @@ +@@ -93,11 +87,9 @@ add_cblas_test(ctest1.out "" xccblat1) add_cblas_test(ctest2.out cin2 xccblat2) add_cblas_test(ctest3.out cin3 xccblat3) @@ -288,7 +273,7 @@ diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt add_executable(xzcblat1 c_zblat1.f ${ZTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h) -@@ -110,5 +102,4 @@ +@@ -109,5 +101,4 @@ add_cblas_test(ztest1.out "" xzcblat1) add_cblas_test(ztest2.out zin2 xzcblat2) add_cblas_test(ztest3.out zin3 xzcblat3) @@ -297,7 +282,7 @@ diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -122,7 +122,33 @@ +@@ -148,7 +148,33 @@ # -------------------------------------------------- # Precision to build # By default all precisions are generated @@ -331,7 +316,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # -------------------------------------------------- # Subdirectories that need to be processed -@@ -214,10 +240,6 @@ +@@ -240,10 +266,6 @@ if(NOT LATESTLAPACK_FOUND) message(STATUS "Using supplied NETLIB LAPACK implementation") set( LAPACK_LIBRARIES lapack ) @@ -731,7 +716,7 @@ diff --git a/TESTING/MATGEN/CMakeLists.txt b/TESTING/MATGEN/CMakeLists.txt endif() if(BUILD_COMPLEX16) - set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN}) -+ LIST(APPEND ALLOBJ ${ZMATGEN} ${DZATGEN}) ++ list(APPEND ALLOBJ ${ZMATGEN} ${DZATGEN}) endif() +list(REMOVE_DUPLICATES ALLOBJ) |