Skip to content

Commit 5bc7962

Browse files
committed
tmp: verbose
1 parent 427c730 commit 5bc7962

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/fpm_meta.f90

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ subroutine resolve_model(self,model,error)
329329
if (self%has_cxx_flags) model%cxx_compile_flags = model%cxx_compile_flags//self%cxxflags%s
330330

331331
if (self%has_link_flags) then
332-
model%link_flags = model%link_flags//self%link_flags%s
332+
model%link_flags = model%link_flags//' '//self%link_flags%s
333333
end if
334334

335335
if (self%has_link_libraries) then
@@ -1754,9 +1754,14 @@ subroutine init_hdf5(this,compiler,error)
17541754
this%has_link_libraries = .true.
17551755
this%link_libs = [this%link_libs, string_t(libs(i)%s(3:))]
17561756

1757+
print *, 'HDF5: add link library '//libs(i)%s(3:)
1758+
17571759
else ! -L and other: concatenate
17581760
this%has_link_flags = .true.
17591761
this%link_flags = string_t(trim(this%link_flags%s)//' '//libs(i)%s)
1762+
1763+
print *, 'HDF5: add link flag '//libs(i)%s
1764+
17601765
end if
17611766
end do
17621767

src/fpm_pkg_config.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function pkgcfg_get_libs(package,error) result(libraries)
114114
nlib = size(tokens)
115115
allocate(libraries(nlib))
116116
do i=1,nlib
117-
libraries(i) = string_t(trim(tokens(i)))
117+
libraries(i) = string_t(string_t(trim(adjustl(tokens(i))))
118118
end do
119119

120120
else
@@ -232,7 +232,7 @@ function pkgcfg_get_build_flags(name,allow_system,error) result(flags)
232232
nlib = size(tokens)
233233
allocate(flags(nlib))
234234
do i=1,nlib
235-
flags(i) = string_t(trim(tokens(i)))
235+
flags(i) = string_t(trim(adjustl(tokens(i))))
236236
end do
237237

238238
else

0 commit comments

Comments
 (0)