Skip to content

Commit 4f97df9

Browse files
authored
Merge pull request #677 from friedc/master
Solve build issues with ibm xlf
2 parents 08de166 + f039b8c commit 4f97df9

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

BLAS/SRC/xerbla_array.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ SUBROUTINE XERBLA_ARRAY(SRNAME_ARRAY, SRNAME_LEN, INFO)
105105
EXTERNAL XERBLA
106106
* ..
107107
* .. Executable Statements ..
108-
SRNAME = ''
108+
SRNAME = ' '
109109
DO I = 1, MIN( SRNAME_LEN, LEN( SRNAME ) )
110110
SRNAME( I:I ) = SRNAME_ARRAY( I )
111111
END DO

CMAKE/CheckLAPACKCompilerFlags.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ if ( FORTRAN_ILP )
2222
else ()
2323
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -integer-size 64")
2424
endif()
25+
elseif( (CMAKE_Fortran_COMPILER_ID STREQUAL "VisualAge" ) OR # CMake 2.6
26+
(CMAKE_Fortran_COMPILER_ID STREQUAL "XL" ) ) # CMake 2.8
27+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qintsize=8")
2528
elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "NAG" )
2629
if ( WIN32 )
2730
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} /i8")

LAPACKE/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
if(NOT LAPACKE)
2+
return()
3+
endif()
4+
5+
16
# Create a header file lapacke_mangling.h for the routines called in my C programs
27
include(FortranCInterface)
38
## Ensure that the fortran compiler and c compiler specified are compatible
@@ -14,11 +19,6 @@ endif()
1419
add_subdirectory(include)
1520

1621

17-
if(NOT LAPACKE)
18-
return()
19-
endif()
20-
21-
2222
message(STATUS "LAPACKE enabled")
2323
enable_language(C)
2424

SRC/dsytrd_sy2sb.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ SUBROUTINE DSYTRD_SY2SB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
293293
INFO = 0
294294
UPPER = LSAME( UPLO, 'U' )
295295
LQUERY = ( LWORK.EQ.-1 )
296-
LWMIN = ILAENV2STAGE( 4, 'DSYTRD_SY2SB', '', N, KD, -1, -1 )
296+
LWMIN = ILAENV2STAGE( 4, 'DSYTRD_SY2SB', ' ', N, KD, -1, -1 )
297297

298298
IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
299299
INFO = -1

SRC/xerbla_array.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ SUBROUTINE XERBLA_ARRAY( SRNAME_ARRAY, SRNAME_LEN, INFO)
115115
EXTERNAL XERBLA
116116
* ..
117117
* .. Executable Statements ..
118-
SRNAME = ''
118+
SRNAME = ' '
119119
DO I = 1, MIN( SRNAME_LEN, LEN( SRNAME ) )
120120
SRNAME( I:I ) = SRNAME_ARRAY( I )
121121
END DO

SRC/zhetrd_he2hb.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ SUBROUTINE ZHETRD_HE2HB( UPLO, N, KD, A, LDA, AB, LDAB, TAU,
293293
INFO = 0
294294
UPPER = LSAME( UPLO, 'U' )
295295
LQUERY = ( LWORK.EQ.-1 )
296-
LWMIN = ILAENV2STAGE( 4, 'ZHETRD_HE2HB', '', N, KD, -1, -1 )
296+
LWMIN = ILAENV2STAGE( 4, 'ZHETRD_HE2HB', ' ', N, KD, -1, -1 )
297297

298298
IF( .NOT.UPPER .AND. .NOT.LSAME( UPLO, 'L' ) ) THEN
299299
INFO = -1

0 commit comments

Comments
 (0)