diff options
| author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-09-27 12:22:03 +0100 |
|---|---|---|
| committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-09-28 09:46:04 +0100 |
| commit | 72dab19de88c2d31deccad2e6f988fb85e614190 (patch) | |
| tree | 9405abf956a63df80b88cccd54d91dd2dbaa950e | |
| parent | 6f8a4466edde51653439f03a34e6fab6f2ff2071 (diff) | |
| download | fpm-72dab19de88c2d31deccad2e6f988fb85e614190.tar.gz fpm-72dab19de88c2d31deccad2e6f988fb85e614190.zip | |
Minor fix: to local dependency relative path
Local dependency paths are relative to the dependent package not the building package.
| -rw-r--r-- | fpm/src/fpm.f90 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpm/src/fpm.f90 b/fpm/src/fpm.f90 index 4b2d515..887ba22 100644 --- a/fpm/src/fpm.f90 +++ b/fpm/src/fpm.f90 @@ -69,7 +69,7 @@ recursive subroutine add_libsources_from_package(sources,package_list,package, & if (allocated(error)) then return end if - + end if contains @@ -97,11 +97,11 @@ recursive subroutine add_libsources_from_package(sources,package_list,package, & if (allocated(dependency_list(i)%path)) then call get_package_data(dependency, & - join_path(dependency_list(i)%path,"fpm.toml"), error) + join_path(package_root,dependency_list(i)%path,"fpm.toml"), error) if (allocated(error)) then error%message = 'Error while parsing manifest for dependency package at:'//& - new_line('a')//join_path(dependency_list(i)%path,"fpm.toml")//& + new_line('a')//join_path(package_root,dependency_list(i)%path,"fpm.toml")//& new_line('a')//error%message return end if |