diff options
author | LKedward <laurence.kedward@bristol.ac.uk> | 2021-07-28 15:51:59 +0100 |
---|---|---|
committer | LKedward <laurence.kedward@bristol.ac.uk> | 2021-07-28 15:51:59 +0100 |
commit | 18e2dab82c0760c501d4634e935b2ed7a50c26a5 (patch) | |
tree | ec865ea2200ff27162dcf12b63b79356870c55eb /src/fpm.f90 | |
parent | bb0c412b4a331166c12f48b90dd0d5397da34e04 (diff) | |
parent | 9e26b2d66c72c81ac5a0d752528104293836d206 (diff) | |
download | fpm-18e2dab82c0760c501d4634e935b2ed7a50c26a5.tar.gz fpm-18e2dab82c0760c501d4634e935b2ed7a50c26a5.zip |
Merge remote-tracking branch 'upstream/master' into file-listing
Diffstat (limited to 'src/fpm.f90')
-rw-r--r-- | src/fpm.f90 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/fpm.f90 b/src/fpm.f90 index d32051b..89eca1a 100644 --- a/src/fpm.f90 +++ b/src/fpm.f90 @@ -416,11 +416,20 @@ subroutine cmd_run(settings,test) do i=1,size(executables) if (exists(executables(i)%s)) then if(settings%runner .ne. ' ')then - call run(settings%runner//' '//executables(i)%s//" "//settings%args, & + if(.not.allocated(settings%args))then + call run(settings%runner//' '//executables(i)%s, & echo=settings%verbose, exitstat=stat(i)) + else + call run(settings%runner//' '//executables(i)%s//" "//settings%args, & + echo=settings%verbose, exitstat=stat(i)) + endif else - call run(executables(i)%s//" "//settings%args,echo=settings%verbose, & + if(.not.allocated(settings%args))then + call run(executables(i)%s,echo=settings%verbose, exitstat=stat(i)) + else + call run(executables(i)%s//" "//settings%args,echo=settings%verbose, & exitstat=stat(i)) + endif endif else call fpm_stop(1,'*cmd_run*:'//executables(i)%s//' not found') |