From 58cc2036e5af35c72e7864b5dd019c02dfd7ff23 Mon Sep 17 00:00:00 2001 From: LKedward Date: Tue, 15 Dec 2020 10:01:18 +0000 Subject: Update: with_example demo to test for object collision --- example_packages/with_examples/example/prog.f90 | 3 +++ example_packages/with_examples/fpm.toml | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 example_packages/with_examples/example/prog.f90 (limited to 'example_packages/with_examples') diff --git a/example_packages/with_examples/example/prog.f90 b/example_packages/with_examples/example/prog.f90 new file mode 100644 index 0000000..a48b7fd --- /dev/null +++ b/example_packages/with_examples/example/prog.f90 @@ -0,0 +1,3 @@ +program demo + write(*, '(a)') "This is a simple example 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 d7d2926..e10f783 100644 --- a/example_packages/with_examples/fpm.toml +++ b/example_packages/with_examples/fpm.toml @@ -5,3 +5,8 @@ build.auto-examples = false name = "demo-prog" source-dir = "demo" main = "prog.f90" + +[[example]] +name = "example-prog" +source-dir = "example" +main = "prog.f90" -- cgit v1.2.3 From c99b2765f7e3496d742c2b265a6f9fe78c4f9e58 Mon Sep 17 00:00:00 2001 From: LKedward Date: Wed, 16 Dec 2020 11:55:27 +0000 Subject: Fix: collision between app and example executables of the same name Use a separate example subdirectory in 'build' to store example executables. --- example_packages/with_examples/app/demo-prog.f90 | 3 +++ example_packages/with_examples/demo/prog.f90 | 3 --- example_packages/with_examples/fpm.toml | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) create mode 100644 example_packages/with_examples/app/demo-prog.f90 delete mode 100644 example_packages/with_examples/demo/prog.f90 (limited to 'example_packages/with_examples') 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" -- cgit v1.2.3 From 19d425247f82c5d000dbf6d640c3612fa18fc7e4 Mon Sep 17 00:00:00 2001 From: LKedward Date: Wed, 16 Dec 2020 12:46:42 +0000 Subject: Revert unnecessary changes for PR --- example_packages/with_examples/demo/prog.f90 | 3 +++ example_packages/with_examples/example/prog.f90 | 3 --- example_packages/with_examples/fpm.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 example_packages/with_examples/demo/prog.f90 delete mode 100644 example_packages/with_examples/example/prog.f90 (limited to 'example_packages/with_examples') diff --git a/example_packages/with_examples/demo/prog.f90 b/example_packages/with_examples/demo/prog.f90 new file mode 100644 index 0000000..8b3d882 --- /dev/null +++ b/example_packages/with_examples/demo/prog.f90 @@ -0,0 +1,3 @@ +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/example/prog.f90 b/example_packages/with_examples/example/prog.f90 deleted file mode 100644 index a48b7fd..0000000 --- a/example_packages/with_examples/example/prog.f90 +++ /dev/null @@ -1,3 +0,0 @@ -program demo - write(*, '(a)') "This is a simple example 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 a2b37b3..d7d2926 100644 --- a/example_packages/with_examples/fpm.toml +++ b/example_packages/with_examples/fpm.toml @@ -3,5 +3,5 @@ build.auto-examples = false [[example]] name = "demo-prog" -source-dir = "example" +source-dir = "demo" main = "prog.f90" -- cgit v1.2.3