Merge pull request #377 from LKedward/include-dir

Add explicit include-dir key to manifest

Author: LKedward

ci/run_tests.bat

@@ -187,4 +187,28 @@ if errorlevel 1 exit 1
 %fpm_path% run --target gomp_test
 if errorlevel 1 exit 1
 
+
+cd ..\fortran_includes
+if errorlevel 1 exit 1
+
+del /q /f build
+%fpm_path% build
+if errorlevel 1 exit 1
+
+
+cd ..\c_includes
+if errorlevel 1 exit 1
+
+del /q /f build
+%fpm_path% build
+if errorlevel 1 exit 1
+
+
+cd ..\c_header_only
+if errorlevel 1 exit 1
+
+del /q /f build
+%fpm_path% build
+if errorlevel 1 exit 1
+
 cd ..\..

ci/run_tests.sh

@@ -89,5 +89,14 @@ cd ../link_executable
 "${f_fpm_path}" build
 "${f_fpm_path}" run --target gomp_test
 
+cd ../fortran_includes
+"${f_fpm_path}" build
+
+cd ../c_includes
+"${f_fpm_path}" build
+
+cd ../c_header_only
+"${f_fpm_path}" build
+
 # Cleanup
 rm -rf ./*/build

example_packages/README.md

@@ -7,8 +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  |
+| c_header_only       | C header-only library                                         |            N            |  Y  |
+| c_includes          | C library with c include directory and dependency includes    |            N            |  Y  |
 | circular_example    | Local path dependency; circular dependency                    |            Y            |  Y  |
 | circular_test       | Local path dependency; circular dependency                    |            Y            |  Y  |
+| fortran_includes    | Fortran library with explicit include directory               |            Y            |  N  |
 | 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            |  Y  |

example_packages/c_header_only/.gitignore

@@ -0,0 +1 @@
+build/*

example_packages/c_header_only/fpm.toml

@@ -0,0 +1 @@
+name = "c_header_only"

example_packages/c_header_only/include/c_header.h

@@ -0,0 +1 @@
+int printf ( const char * format, ... );

example_packages/c_includes/.gitignore

@@ -0,0 +1 @@
+build/*

example_packages/c_includes/fpm.toml

@@ -0,0 +1,4 @@
+name = "c_includes"
+
+[dependencies]
+c_header_only = { path = "../c_header_only"}

example_packages/c_includes/include/lib.h

@@ -0,0 +1,4 @@
+// Include from "c_header_only" dependency
+#include "c_header.h"
+
+int test(const int a);

example_packages/c_includes/src/lib.c

@@ -0,0 +1,7 @@
+#include "lib.h"
+
+int test(const int a){
+
+  return printf("input: %d\n", a);
+
+}