diff options
| author | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-22 14:03:06 -0500 |
|---|---|---|
| committer | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-22 14:03:06 -0500 |
| commit | 39cca4d6f55a9c1e666f98544a5ccb10a8d84334 (patch) | |
| tree | 3d346a9034cacdc1184ad14ceb6133c95a79e029 /example_packages | |
| parent | e7b135b834f79f819fbe27e616a3fdff155b0fdc (diff) | |
| parent | ad9ebadbde4405a544e5cf32f1f5d3507a7e2dfd (diff) | |
| download | fpm-39cca4d6f55a9c1e666f98544a5ccb10a8d84334.tar.gz fpm-39cca4d6f55a9c1e666f98544a5ccb10a8d84334.zip | |
Merge branch 'master' into bootstrap_submodule_support
Diffstat (limited to 'example_packages')
| -rw-r--r-- | example_packages/README.md | 6 | ||||
| -rw-r--r-- | example_packages/hello_complex_2/app/say_hello/app_hello_mod.f90 | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/example_packages/README.md b/example_packages/README.md index 79fadb1..65f4109 100644 --- a/example_packages/README.md +++ b/example_packages/README.md @@ -7,11 +7,11 @@ the features demonstrated in each package and which versions of fpm are supporte | Name | Features | Bootstrap (Haskell) fpm | fpm | |---------------------|---------------------------------------------------------------|:-----------------------:|:---:| | auto_discovery_off | Default layout with auto-discovery disabled | N | Y | -| circular_example | Local path dependency; circular dependency | Y | N | -| circular_test | Local path dependency; circular dependency | Y | N | +| circular_example | Local path dependency; circular dependency | Y | Y | +| circular_test | Local path dependency; circular dependency | Y | Y | | hello_complex | Non-standard directory layout; multiple tests and executables | Y | Y | | hello_complex_2 | Auto-discovery of tests and executables with modules | N | Y | -| hello_fpm | App-only; local path dependency | Y | N | +| hello_fpm | App-only; local path dependency | Y | Y | | hello_world | App-only | Y | Y | | makefile_complex | External build command (makefile); local path dependency | Y | N | | program_with_module | App-only; module+program in single source file | Y | Y | 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 5c426c8..c5795cb 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,6 @@ module app_hello_mod implicit none +integer :: hello_int = 42 + end module app_hello_mod |