aboutsummaryrefslogtreecommitdiff
path: root/example_packages
diff options
context:
space:
mode:
authorLKedward <laurence.kedward@bristol.ac.uk>2020-12-16 11:55:27 +0000
committerLKedward <laurence.kedward@bristol.ac.uk>2020-12-16 12:46:10 +0000
commitc99b2765f7e3496d742c2b265a6f9fe78c4f9e58 (patch)
treed5d6838e307abca9a1089b4b3cc3261e493f2e75 /example_packages
parent58cc2036e5af35c72e7864b5dd019c02dfd7ff23 (diff)
downloadfpm-c99b2765f7e3496d742c2b265a6f9fe78c4f9e58.tar.gz
fpm-c99b2765f7e3496d742c2b265a6f9fe78c4f9e58.zip
Fix: collision between app and example executables of the same name
Use a separate example subdirectory in 'build' to store example executables.
Diffstat (limited to 'example_packages')
-rw-r--r--example_packages/with_examples/app/demo-prog.f903
-rw-r--r--example_packages/with_examples/demo/prog.f903
-rw-r--r--example_packages/with_examples/fpm.toml5
3 files changed, 3 insertions, 8 deletions
diff --git a/example_packages/with_examples/app/demo-prog.f90 b/example_packages/with_examples/app/demo-prog.f90
new file mode 100644
index 0000000..f26e898
--- /dev/null
+++ b/example_packages/with_examples/app/demo-prog.f90
@@ -0,0 +1,3 @@
+program demo
+ write(*, '(a)') "This is a simple program"
+end program demo
diff --git a/example_packages/with_examples/demo/prog.f90 b/example_packages/with_examples/demo/prog.f90
deleted file mode 100644
index 8b3d882..0000000
--- a/example_packages/with_examples/demo/prog.f90
+++ /dev/null
@@ -1,3 +0,0 @@
-program demo
- write(*, '(a)') "This is a simple demo program, but not a real application"
-end program demo
diff --git a/example_packages/with_examples/fpm.toml b/example_packages/with_examples/fpm.toml
index e10f783..a2b37b3 100644
--- a/example_packages/with_examples/fpm.toml
+++ b/example_packages/with_examples/fpm.toml
@@ -3,10 +3,5 @@ build.auto-examples = false
[[example]]
name = "demo-prog"
-source-dir = "demo"
-main = "prog.f90"
-
-[[example]]
-name = "example-prog"
source-dir = "example"
main = "prog.f90"