Browse Source

Update LAPACK to 3.9.0

pull/2353/head
Martin Kroeker GitHub 6 years ago
parent
commit
6d9ff11919
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
  1. +14
    -5
      lapack-netlib/CBLAS/CMakeLists.txt
  2. +8
    -2
      lapack-netlib/CBLAS/Makefile

+ 14
- 5
lapack-netlib/CBLAS/CMakeLists.txt View File

@@ -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
# )

+ 8
- 2
lapack-netlib/CBLAS/Makefile View File

@@ -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


Loading…
Cancel
Save