From 6d9ff119196e85a5bdfada9aafb249148df38252 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sun, 29 Dec 2019 18:36:50 +0100
Subject: [PATCH] Update LAPACK to 3.9.0

---
 lapack-netlib/CBLAS/CMakeLists.txt | 19 ++++++++++++++-----
 lapack-netlib/CBLAS/Makefile       | 10 ++++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lapack-netlib/CBLAS/CMakeLists.txt b/lapack-netlib/CBLAS/CMakeLists.txt
index d9fa24530..04c5ab795 100644
--- a/lapack-netlib/CBLAS/CMakeLists.txt
+++ b/lapack-netlib/CBLAS/CMakeLists.txt
@@ -12,8 +12,10 @@ FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
                          SYMBOL_NAMESPACE "F77_")
 if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
   message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
-  configure_file(include/lapacke_mangling_with_flags.h.in
-                 ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
+    configure_file(include/lapacke_mangling_with_flags.h.in
+                  ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
+    configure_file(include/cblas_mangling_with_flags.h.in
+                 ${LAPACK_BINARY_DIR}/include/cblas_mangling.h)
 endif()
 
 include_directories(include ${LAPACK_BINARY_DIR}/include)
@@ -28,7 +30,10 @@ endforeach()
 endmacro()
 
 append_subdir_files(CBLAS_INCLUDE "include")
-install(FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  COMPONENT Development
+  )
 
 # --------------------------------------------------
 if(BUILD_TESTING)
@@ -45,7 +50,9 @@ endif()
 set(_cblas_config_install_guard_target "")
 if(ALL_TARGETS)
   install(EXPORT cblas-targets
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION})
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+    COMPONENT Development
+    )
   # Choose one of the cblas targets to use as a guard for
   # cblas-config.cmake to load targets from the install tree.
   list(GET ALL_TARGETS 0 _cblas_config_install_guard_target)
@@ -82,4 +89,6 @@ install(FILES
   )
 
 #install(EXPORT cblas-targets
-#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION})
+#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION}
+#  COMPONENT Development
+#  )
diff --git a/lapack-netlib/CBLAS/Makefile b/lapack-netlib/CBLAS/Makefile
index 513e8fc82..6e199cdce 100644
--- a/lapack-netlib/CBLAS/Makefile
+++ b/lapack-netlib/CBLAS/Makefile
@@ -1,19 +1,25 @@
-include ../make.inc
+TOPSRCDIR = ..
+include $(TOPSRCDIR)/make.inc
 
+.PHONY: all
 all: cblas
 
+.PHONY: cblas
 cblas: include/cblas_mangling.h
 	$(MAKE) -C src
 
 include/cblas_mangling.h: include/cblas_mangling_with_flags.h.in
-	cp $< $@
+	cp include/cblas_mangling_with_flags.h.in $@
 
+.PHONY: cblas_testing
 cblas_testing: cblas
 	$(MAKE) -C testing run
 
+.PHONY: cblas_example
 cblas_example: cblas
 	$(MAKE) -C examples
 
+.PHONY: clean cleanobj cleanlib cleanexe cleantest
 clean:
 	$(MAKE) -C src clean
 	$(MAKE) -C testing clean