Move remaining OpenBLAS related changes from 3.6.0 to 3.6.1

diff --git a/lapack-netlib/CMAKE/CheckFortranTypeSizes.cmake b/lapack-netlib/CMAKE/CheckFortranTypeSizes.cmake
index 9cc12ce..9923117 100644 (file)
--- a/lapack-netlib/CMAKE/CheckFortranTypeSizes.cmake
+++ b/lapack-netlib/CMAKE/CheckFortranTypeSizes.cmake
@@ -18,7 +18,7 @@
 macro( _CHECK_FORTRAN_TYPE_SIZE _TYPE_NAME _TEST_SIZES )
 
   foreach( __TEST_SIZE ${_TEST_SIZES} )
-    set( __TEST_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortran${_TYPE_NAME}Size${__TEST_SIZE}.f90 )
+         set( __TEST_FILE ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortran${_TYPE_NAME}Size${__TEST_SIZE}.f90 )
     file( WRITE ${__TEST_FILE} 
 "
        PROGRAM check_size
@@ -27,7 +27,7 @@ macro( _CHECK_FORTRAN_TYPE_SIZE _TYPE_NAME _TEST_SIZES )
          pa => a
        END PROGRAM
 ")
-    try_compile( SIZEOF_${_TYPE_NAME} ${CMAKE_BINARY_DIR} ${__TEST_FILE} )
+try_compile( SIZEOF_${_TYPE_NAME} ${PROJECT_BINARY_DIR} ${__TEST_FILE} )
     if( SIZEOF_${_TYPE_NAME} )
       message( STATUS "Testing default ${_TYPE_NAME}*${__TEST_SIZE} - found" )
       set( SIZEOF_${_TYPE_NAME} ${__TEST_SIZE} CACHE INTERNAL "Size of the default ${_TYPE_NAME} type" FORCE )

diff --git a/lapack-netlib/CMAKE/CheckTimeFunction.cmake b/lapack-netlib/CMAKE/CheckTimeFunction.cmake
index 350a591..1a65f24 100644 (file)
--- a/lapack-netlib/CMAKE/CheckTimeFunction.cmake
+++ b/lapack-netlib/CMAKE/CheckTimeFunction.cmake
@@ -16,11 +16,11 @@ macro(CHECK_TIME_FUNCTION FUNCTION VARIABLE)
     if(RES)
       set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}")
       message(STATUS "Looking for Fortran ${FUNCTION} - found")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+      file(APPEND ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
         "Fortran ${FUNCTION} exists. ${OUTPUT} \n\n")
     else(RES)
       message(STATUS "Looking for Fortran ${FUNCTION} - not found")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+      file(APPEND ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
         "Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n")
     endif(RES)
 endmacro(CHECK_TIME_FUNCTION)

diff --git a/lapack-netlib/CMAKE/FortranMangling.cmake b/lapack-netlib/CMAKE/FortranMangling.cmake
index 98b8443..538c802 100644 (file)
--- a/lapack-netlib/CMAKE/FortranMangling.cmake
+++ b/lapack-netlib/CMAKE/FortranMangling.cmake
@@ -43,7 +43,7 @@ MESSAGE(STATUS "Testing FORTRAN_MANGLING")
 MESSAGE(STATUS "Compiling Finface.f...")
 
     execute_process ( COMMAND  ${CMAKE_Fortran_COMPILER} ${F77_OPTION_COMPILE} ${PROJECT_SOURCE_DIR}/lapacke/mangling/Fintface.f
-      WORKING_DIRECTORY  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
+      WORKING_DIRECTORY  ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
       OUTPUT_VARIABLE    OUTPUT
       RESULT_VARIABLE    RESULT
       ERROR_VARIABLE     ERROR)
@@ -58,7 +58,7 @@ MESSAGE(STATUS "Compiling Finface.f...")
 MESSAGE(STATUS "Compiling Cintface.c...")
 
     execute_process ( COMMAND  ${CMAKE_C_COMPILER} ${F77_OPTION_COMPILE} ${PROJECT_SOURCE_DIR}/lapacke/mangling/Cintface.c
-      WORKING_DIRECTORY  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
+      WORKING_DIRECTORY  ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
       OUTPUT_VARIABLE    OUTPUT
       RESULT_VARIABLE    RESULT
       ERROR_VARIABLE     ERROR)
@@ -73,7 +73,7 @@ MESSAGE(STATUS "Compiling Cintface.c...")
 MESSAGE(STATUS "Linking Finface.f and Cintface.c...")
 
     execute_process ( COMMAND  ${CMAKE_Fortran_COMPILER} ${F77_OUTPUT_OBJ} xintface.exe Fintface.o Cintface.o
-      WORKING_DIRECTORY  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
+      WORKING_DIRECTORY  ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
       OUTPUT_VARIABLE    OUTPUT
       RESULT_VARIABLE    RESULT
       ERROR_VARIABLE     ERROR)
@@ -88,7 +88,7 @@ MESSAGE(STATUS "Linking Finface.f and Cintface.c...")
 MESSAGE(STATUS "Running ./xintface...")
 
     execute_process ( COMMAND  ./xintface.exe
-      WORKING_DIRECTORY  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
+      WORKING_DIRECTORY  ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
       RESULT_VARIABLE xintface_RES
       OUTPUT_VARIABLE xintface_OUT
       ERROR_VARIABLE xintface_ERR)

diff --git a/lapack-netlib/INSTALL/Makefile b/lapack-netlib/INSTALL/Makefile
index 7f7ecc0..a745cad 100644 (file)
--- a/lapack-netlib/INSTALL/Makefile
+++ b/lapack-netlib/INSTALL/Makefile
@@ -1,7 +1,7 @@
 include ../make.inc
 
 .SUFFIXES : .o .f 
-all:  testlsame testslamch testdlamch testsecond testdsecnd testieee testversion 
+all:  testlsame testslamch testdlamch testsecond testdsecnd testieee testversion slamch.o dlamch.o 
 
 testlsame:  lsame.o lsametst.o
        $(LOADER) $(LOADOPTS) -o testlsame lsame.o lsametst.o