From c957b27d275ebd575b5d49599c14e7252765f3ce Mon Sep 17 00:00:00 2001 From: LKedward Date: Thu, 8 Apr 2021 15:27:07 +0100 Subject: Select c compiler based on fortran compiler id --- src/fpm_model.f90 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/fpm_model.f90') diff --git a/src/fpm_model.f90 b/src/fpm_model.f90 index bfb0115..5c575fc 100644 --- a/src/fpm_model.f90 +++ b/src/fpm_model.f90 @@ -117,6 +117,9 @@ type :: fpm_model_t !> Command line name to invoke fortran compiler character(:), allocatable :: fortran_compiler + !> Command line name to invoke c compiler + character(:), allocatable :: c_compiler + !> Command line flags passed to fortran for compilation character(:), allocatable :: fortran_compile_flags -- cgit v1.2.3 From a49b0177f8d7ca74b3bfaa325fd37ee614975367 Mon Sep 17 00:00:00 2001 From: LKedward Date: Mon, 12 Apr 2021 16:39:29 +0100 Subject: Add: external-modules key to build table for non-fpm modules --- src/fpm_model.f90 | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/fpm_model.f90') diff --git a/src/fpm_model.f90 b/src/fpm_model.f90 index bfb0115..ec366d6 100644 --- a/src/fpm_model.f90 +++ b/src/fpm_model.f90 @@ -129,6 +129,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 @@ -276,6 +279,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 -- cgit v1.2.3 From 0ac5f5bef94c8f12caa64f19fe6cb5026a5535c0 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Thu, 15 Apr 2021 14:59:15 -0500 Subject: feat(ar): use lib instead of ar on Windows if ar isn't available --- src/fpm_model.f90 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/fpm_model.f90') diff --git a/src/fpm_model.f90 b/src/fpm_model.f90 index bfb0115..84f70d4 100644 --- a/src/fpm_model.f90 +++ b/src/fpm_model.f90 @@ -1,6 +1,6 @@ !># The fpm package model !> -!> Defines the fpm model data types which encapsulate all information +!> Defines the fpm model data types which encapsulate all information !> required to correctly build a package and its dependencies. !> !> The process (see `[[build_model(subroutine)]]`) for generating a valid `[[fpm_model]]` involves @@ -117,6 +117,9 @@ type :: fpm_model_t !> Command line name to invoke fortran compiler character(:), allocatable :: fortran_compiler + !> Command line to invoke for creating static library + character(:), allocatable :: archiver + !> Command line flags passed to fortran for compilation character(:), allocatable :: fortran_compile_flags @@ -128,7 +131,7 @@ type :: fpm_model_t !> Native libraries to link against type(string_t), allocatable :: link_libraries(:) - + !> Project dependencies type(dependency_tree_t) :: deps -- cgit v1.2.3