Merge pull request #693 from zoziha/fix_model

Fix show-model option
fortran-lang · May 28, 2022 · 7734124 · 7734124
2 parents aec789f + 26dc01a
commit 7734124
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/fpm_sources.f90 b/src/fpm_sources.f90
@@ -96,6 +96,7 @@ subroutine add_sources_from_dir(sources,directory,scope,with_executables,recurse
         if (allocated(error)) return
 
         dir_sources(i)%unit_scope = scope
+        allocate(dir_sources(i)%link_libraries(0))
 
         ! Exclude executables unless specified otherwise
         exclude_source(i) = (dir_sources(i)%unit_type == FPM_UNIT_PROGRAM)

diff --git a/test/fpm_test/test_source_parsing.f90 b/test/fpm_test/test_source_parsing.f90
@@ -643,6 +643,11 @@ subroutine test_csource(error)
             return
         end if
 
+        if (allocated(f_source%link_libraries)) then
+            call test_failed(error,'Unexpected link_libraries - expecting unallocated')
+            return
+        end if
+
         if (.not.('proto.h' .in. f_source%include_dependencies)) then
             call test_failed(error,'Missing file in include_dependencies')
             return