From d49ae3c5582b85113770bbc52e104063bf960d20 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Fri, 2 Apr 2021 10:57:01 +0200 Subject: Use default to instead of master to reference the repository HEAD --- manifest-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifest-reference.md') diff --git a/manifest-reference.md b/manifest-reference.md index 1a33dc1..f92bd22 100644 --- a/manifest-reference.md +++ b/manifest-reference.md @@ -403,7 +403,7 @@ To use a specific upstream branch declare the *branch* name with ```toml [dependencies] -toml-f = { git = "https://github.com/toml-f/toml-f", branch = "master" } +toml-f = { git = "https://github.com/toml-f/toml-f", branch = "main" } ``` Alternatively, reference tags by using the *tag* entry -- cgit v1.2.3 From 2c0975b729e173042bec227e10fb6bf40a1609dd Mon Sep 17 00:00:00 2001 From: LKedward Date: Mon, 12 Apr 2021 16:54:35 +0100 Subject: Update: manifest-reference with new external-modules key --- manifest-reference.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'manifest-reference.md') diff --git a/manifest-reference.md b/manifest-reference.md index 1a33dc1..89bf1db 100644 --- a/manifest-reference.md +++ b/manifest-reference.md @@ -33,6 +33,8 @@ Every manifest file consists of the following sections: Toggle automatic discovery of executables - [*link*](#link-external-libraries): Link with external dependencies + - [*external-modules*](#use-system-installed-modules): + Specify modules used that are not within your fpm package - Target sections: - [*library*](#library-configuration) Configuration of the library target @@ -353,6 +355,26 @@ In this case the order of the libraries matters: link = ["blas", "lapack"] ``` +## Use system-installed modules + +To use modules that are not defined within your fpm package or its dependencies, +specify the module name using the *external-modules* key in the *build* table. + +*Example:* + +```toml +[build] +external-modules = "netcdff" +``` + +Multiple external modules can be specified as a list. + +*Example:* + +```toml +[build] +external-modules = ["netcdff","h5lt"] +``` ## Automatic target discovery -- cgit v1.2.3 From d407ee0b992dbcde8663c62c06e72f57ea0691a9 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Wed, 14 Apr 2021 17:46:34 +0100 Subject: Update manifest-reference.md Co-authored-by: Milan Curcic --- manifest-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifest-reference.md') diff --git a/manifest-reference.md b/manifest-reference.md index 89bf1db..e8998a9 100644 --- a/manifest-reference.md +++ b/manifest-reference.md @@ -364,7 +364,7 @@ specify the module name using the *external-modules* key in the *build* table. ```toml [build] -external-modules = "netcdff" +external-modules = "netcdf" ``` Multiple external modules can be specified as a list. -- cgit v1.2.3 From d97abb90435501bd392ff3269633a409cfea1cb0 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Wed, 14 Apr 2021 18:52:25 +0100 Subject: Update manifest-reference.md Co-authored-by: Milan Curcic --- manifest-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifest-reference.md') diff --git a/manifest-reference.md b/manifest-reference.md index e8998a9..7b85708 100644 --- a/manifest-reference.md +++ b/manifest-reference.md @@ -373,7 +373,7 @@ Multiple external modules can be specified as a list. ```toml [build] -external-modules = ["netcdff","h5lt"] +external-modules = ["netcdf", "h5lt"] ``` ## Automatic target discovery -- cgit v1.2.3 From 5eb1ee4c21426db55400752bffca5beda47e8c39 Mon Sep 17 00:00:00 2001 From: LKedward Date: Thu, 15 Apr 2021 14:52:35 +0100 Subject: Update: manifest reference with note about external module directories --- manifest-reference.md | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'manifest-reference.md') diff --git a/manifest-reference.md b/manifest-reference.md index 89bf1db..a77c2d2 100644 --- a/manifest-reference.md +++ b/manifest-reference.md @@ -360,6 +360,10 @@ link = ["blas", "lapack"] To use modules that are not defined within your fpm package or its dependencies, specify the module name using the *external-modules* key in the *build* table. +> __Important:__ *fpm* cannot automatically locate external module files; it is the responsibility +> of the user to specify the necessary include directories using compiler flags such that +> the compiler can locate external module files during compilation. + *Example:* ```toml -- cgit v1.2.3