Skip to content

Commit

Permalink
tmp: verbose
Browse files Browse the repository at this point in the history
  • Loading branch information
perazz committed Jun 24, 2024
1 parent 427c730 commit 5bc7962
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/fpm_meta.f90
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ subroutine resolve_model(self,model,error)
if (self%has_cxx_flags) model%cxx_compile_flags = model%cxx_compile_flags//self%cxxflags%s

if (self%has_link_flags) then
model%link_flags = model%link_flags//self%link_flags%s
model%link_flags = model%link_flags//' '//self%link_flags%s
end if

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

print *, 'HDF5: add link library '//libs(i)%s(3:)

else ! -L and other: concatenate
this%has_link_flags = .true.
this%link_flags = string_t(trim(this%link_flags%s)//' '//libs(i)%s)

print *, 'HDF5: add link flag '//libs(i)%s

end if
end do

Expand Down
4 changes: 2 additions & 2 deletions src/fpm_pkg_config.f90
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function pkgcfg_get_libs(package,error) result(libraries)
nlib = size(tokens)
allocate(libraries(nlib))
do i=1,nlib
libraries(i) = string_t(trim(tokens(i)))
libraries(i) = string_t(string_t(trim(adjustl(tokens(i))))
end do

else
Expand Down Expand Up @@ -232,7 +232,7 @@ function pkgcfg_get_build_flags(name,allow_system,error) result(flags)
nlib = size(tokens)
allocate(flags(nlib))
do i=1,nlib
flags(i) = string_t(trim(tokens(i)))
flags(i) = string_t(trim(adjustl(tokens(i))))
end do

else
Expand Down

0 comments on commit 5bc7962

Please sign in to comment.