aboutsummaryrefslogtreecommitdiff
path: root/src/fpm_model.f90
diff options
context:
space:
mode:
authorBrad Richardson <everythingfunctional@protonmail.com>2021-04-22 09:20:50 -0500
committerGitHub <noreply@github.com>2021-04-22 09:20:50 -0500
commita1dbbdab1b1c1d3807d9aa970b7943792f33641f (patch)
treeee26e1ff4ccd05ed465463f82b6b3d37ba03e015 /src/fpm_model.f90
parentfaced2359ff7bf1c003aaf3990d006fde1124186 (diff)
parentfbbfb2c1c316674a83acd666754a3fd18b643d84 (diff)
downloadfpm-a1dbbdab1b1c1d3807d9aa970b7943792f33641f.tar.gz
fpm-a1dbbdab1b1c1d3807d9aa970b7943792f33641f.zip
Merge branch 'master' into different-archiver-on-windows
Diffstat (limited to 'src/fpm_model.f90')
-rw-r--r--src/fpm_model.f9013
1 files changed, 13 insertions, 0 deletions
diff --git a/src/fpm_model.f90 b/src/fpm_model.f90
index 84f70d4..9746e5f 100644
--- a/src/fpm_model.f90
+++ b/src/fpm_model.f90
@@ -120,6 +120,9 @@ type :: fpm_model_t
!> Command line to invoke for creating static library
character(:), allocatable :: archiver
+ !> Command line name to invoke c compiler
+ character(:), allocatable :: c_compiler
+
!> Command line flags passed to fortran for compilation
character(:), allocatable :: fortran_compile_flags
@@ -132,6 +135,9 @@ type :: fpm_model_t
!> Native libraries to link against
type(string_t), allocatable :: link_libraries(:)
+ !> External modules used
+ type(string_t), allocatable :: external_modules(:)
+
!> Project dependencies
type(dependency_tree_t) :: deps
@@ -279,6 +285,13 @@ function info_model(model) result(s)
if (i < size(model%link_libraries)) s = s // ", "
end do
s = s // "]"
+ ! type(string_t), allocatable :: external_modules(:)
+ s = s // ", external_modules=["
+ do i = 1, size(model%external_modules)
+ s = s // '"' // model%external_modules(i)%s // '"'
+ if (i < size(model%external_modules)) s = s // ", "
+ end do
+ s = s // "]"
! type(dependency_tree_t) :: deps
! TODO: print `dependency_tree_t` properly, which should become part of the
! model, not imported from another file