Skip to content

Commit a48c13f

Browse files
committed
Merge branch 'fix-duplicate-discovery' into local-depends
2 parents 22ea5a6 + 10d835a commit a48c13f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fpm/src/fpm_sources.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ subroutine add_sources_from_dir(sources,directory,scope,with_executables,error)
7373
if (allocated(sources)) then
7474
allocate(existing_src_files(size(sources)))
7575
do i=1,size(sources)
76-
existing_src_files(i)%s = sources(i)%file_name
76+
existing_src_files(i)%s = canon_path(sources(i)%file_name)
7777
end do
7878
else
7979
allocate(existing_src_files(0))
8080
end if
8181

82-
is_source = [(.not.(file_names(i)%s .in. existing_src_files) .and. &
82+
is_source = [(.not.(canon_path(file_names(i)%s) .in. existing_src_files) .and. &
8383
(str_ends_with(lower(file_names(i)%s), ".f90") .or. &
8484
str_ends_with(lower(file_names(i)%s), ".c") .or. &
8585
str_ends_with(lower(file_names(i)%s), ".h") ),i=1,size(file_names))]

0 commit comments

Comments
 (0)