diff options
| author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-12-09 14:21:19 +0000 |
|---|---|---|
| committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-12-09 14:21:19 +0000 |
| commit | 4e9ac3ef08a8e81da164a0d99a43f292666b8aa4 (patch) | |
| tree | 7a6aebb5206fd511439ba6e41a7c891fcd574459 /example_packages | |
| parent | 3d1ac15bdd2ba28565482195fcb528d96012e35a (diff) | |
| parent | 6e46fba605e43473e7d7f680f13ca8ff02ec436e (diff) | |
| download | fpm-4e9ac3ef08a8e81da164a0d99a43f292666b8aa4.tar.gz fpm-4e9ac3ef08a8e81da164a0d99a43f292666b8aa4.zip | |
Merge remote-tracking branch 'upstream/master' into dev-docs-model
Diffstat (limited to 'example_packages')
3 files changed, 9 insertions, 2 deletions
diff --git a/example_packages/hello_complex_2/app/say_hello/app_extra_mod.f90 b/example_packages/hello_complex_2/app/say_hello/app_extra_mod.f90 new file mode 100644 index 0000000..5059e22 --- /dev/null +++ b/example_packages/hello_complex_2/app/say_hello/app_extra_mod.f90 @@ -0,0 +1,6 @@ +module app_extra_mod +implicit none + +character(len=5) :: greet_object = "World" + +end module app_extra_mod diff --git a/example_packages/hello_complex_2/app/say_hello/app_hello_mod.f90 b/example_packages/hello_complex_2/app/say_hello/app_hello_mod.f90 index c5795cb..e44edd7 100644 --- a/example_packages/hello_complex_2/app/say_hello/app_hello_mod.f90 +++ b/example_packages/hello_complex_2/app/say_hello/app_hello_mod.f90 @@ -1,4 +1,5 @@ module app_hello_mod +use app_extra_mod, only: greet_object implicit none integer :: hello_int = 42 diff --git a/example_packages/hello_complex_2/app/say_hello/say_Hello.f90 b/example_packages/hello_complex_2/app/say_hello/say_Hello.f90 index 3b69ba7..3ebaebb 100644 --- a/example_packages/hello_complex_2/app/say_hello/say_Hello.f90 +++ b/example_packages/hello_complex_2/app/say_hello/say_Hello.f90 @@ -1,8 +1,8 @@ program say_Hello use greet_m, only: make_greeting - use app_hello_mod + use app_hello_mod, only: greet_object implicit none - print *, make_greeting("World") + print *, make_greeting(greet_object) end program say_Hello |