diff options
-rw-r--r-- | CBLAS/CMakeLists.txt | 24 | ||||
-rw-r--r-- | CBLAS/include/CMakeLists.txt | 2 | ||||
-rw-r--r-- | LAPACKE/CMakeLists.txt | 29 | ||||
-rw-r--r-- | LAPACKE/include/CMakeLists.txt | 2 |
4 files changed, 25 insertions, 32 deletions
diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt index 95b3bf6e..5dac7334 100644 --- a/CBLAS/CMakeLists.txt +++ b/CBLAS/CMakeLists.txt @@ -5,22 +5,18 @@ set(LAPACK_INSTALL_EXPORT_NAME cblas-targets) # Create a header file cblas.h for the routines called in my C programs include(FortranCInterface) -FortranCInterface_HEADER( ${CMAKE_CURRENT_SOURCE_DIR}/include/cblas_mangling.h +## Ensure that the fortran compiler and c compiler specified are compatible +FortranCInterface_VERIFY() +FortranCInterface_HEADER( ${LAPACK_BINARY_DIR}/include/cblas_mangling.h MACRO_NAMESPACE "F77_" 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 ) +endif () -# Old way to detect mangling -#include(FortranMangling) -#FORTRAN_MANGLING(CDEFS) -#set(CDEFS ${CDEFS} CACHE STRING "Fortran Mangling" FORCE) -#MESSAGE(STATUS "=========") - -# -------------------------------------------------- -# Compiler Flags -#ADD_DEFINITIONS( "-D${CDEFS}") - - -include_directories( include ) +include_directories( include ${LAPACK_BINARY_DIR}/include ) add_subdirectory(include) add_subdirectory(src) @@ -32,7 +28,7 @@ endforeach() endmacro() append_subdir_files(CBLAS_INCLUDE "include") -INSTALL( FILES ${CBLAS_INCLUDE} DESTINATION include ) +INSTALL( FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h DESTINATION include ) # -------------------------------------------------- if(BUILD_TESTING) diff --git a/CBLAS/include/CMakeLists.txt b/CBLAS/include/CMakeLists.txt index 06093f43..208733b2 100644 --- a/CBLAS/include/CMakeLists.txt +++ b/CBLAS/include/CMakeLists.txt @@ -1,3 +1,3 @@ -SET (CBLAS_INCLUDE cblas.h cblas_f77.h cblas_test.h cblas_mangling.h) +SET (CBLAS_INCLUDE cblas.h cblas_f77.h cblas_test.h ) file(COPY ${CBLAS_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include) diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt index 4c61eaa0..7208d53e 100644 --- a/LAPACKE/CMakeLists.txt +++ b/LAPACKE/CMakeLists.txt @@ -3,21 +3,18 @@ enable_language(C) set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets) -# Create a header file netlib.h for the routines called in my C programs +# Create a header file lapacke_mangling.h for the routines called in my C programs include(FortranCInterface) -FortranCInterface_HEADER( ${CMAKE_CURRENT_SOURCE_DIR}/include/lapacke_mangling.h - MACRO_NAMESPACE "LAPACK_" - SYMBOL_NAMESPACE "LAPACK_" ) - -# Old way to detect mangling -#include(FortranMangling) -#FORTRAN_MANGLING(CDEFS) -#set(CDEFS ${CDEFS} CACHE STRING "Fortran Mangling" FORCE) -#MESSAGE(STATUS "=========") - -# -------------------------------------------------- -# Compiler Flags -#ADD_DEFINITIONS( "-D${CDEFS}") +## Ensure that the fortran compiler and c compiler specified are compatible +FortranCInterface_VERIFY() +FortranCInterface_HEADER( ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h + MACRO_NAMESPACE "LAPACK_" + SYMBOL_NAMESPACE "LAPACK_" ) +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 ) +endif () if (WIN32 AND NOT UNIX) ADD_DEFINITIONS(-DHAVE_LAPACK_CONFIG_H -DLAPACK_COMPLEX_STRUCTURE) @@ -26,7 +23,7 @@ endif (WIN32 AND NOT UNIX) get_directory_property( DirDefs COMPILE_DEFINITIONS ) -include_directories( include ) +include_directories( include ${LAPACK_BINARY_DIR}/include ) add_subdirectory(include) add_subdirectory(src) add_subdirectory(utils) @@ -58,7 +55,7 @@ else (USE_XBLAS) endif(USE_XBLAS) lapack_install_library(lapacke) -INSTALL( FILES ${LAPACKE_INCLUDE} DESTINATION include ) +INSTALL( FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION include ) if(BUILD_TESTING) add_subdirectory(example) diff --git a/LAPACKE/include/CMakeLists.txt b/LAPACKE/include/CMakeLists.txt index 80b269fb..fbcfbdd9 100644 --- a/LAPACKE/include/CMakeLists.txt +++ b/LAPACKE/include/CMakeLists.txt @@ -1,3 +1,3 @@ -SET (LAPACKE_INCLUDE lapacke.h lapacke_config.h lapacke_utils.h lapacke_mangling.h) +SET (LAPACKE_INCLUDE lapacke.h lapacke_config.h lapacke_utils.h ) file(COPY ${LAPACKE_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include) |