diff options
| author | init current directory[i] <urbanjost@comcast.net> | 2020-12-03 18:49:37 -0500 |
|---|---|---|
| committer | init current directory[i] <urbanjost@comcast.net> | 2020-12-03 18:49:37 -0500 |
| commit | b6ee36664e8f12c6634b7f13e42c380ff6557c0f (patch) | |
| tree | e47444876a2bdccbefd9608592c0daf9bca6b1a6 | |
| parent | 95cab05240361963b0e5f6ae588f1875de4d2015 (diff) | |
| parent | 6371552a374c1afb274efaf3e7e73d118a460764 (diff) | |
| download | fpm-b6ee36664e8f12c6634b7f13e42c380ff6557c0f.tar.gz fpm-b6ee36664e8f12c6634b7f13e42c380ff6557c0f.zip | |
Merge branch 'compiler' of https://github.com/urbanjost/fpm into compiler
| -rw-r--r-- | fpm/src/fpm_command_line.f90 | 20 | ||||
| -rw-r--r-- | fpm/src/fpm_compiler.f90 | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/fpm/src/fpm_command_line.f90 b/fpm/src/fpm_command_line.f90 index 2e93366..a17f699 100644 --- a/fpm/src/fpm_command_line.f90 +++ b/fpm/src/fpm_command_line.f90 @@ -349,7 +349,7 @@ contains if(ii .gt. 0 .and. len(lines).gt. 0) then write(stdout,'(g0)')(trim(lines(iii)), iii=1, ii) else - write(stdout,'(a)')'<WARNING: *printhelp* output requested is empty' + write(stdout,'(a)')'<WARNING> *printhelp* output requested is empty' endif endif end subroutine printhelp @@ -400,9 +400,9 @@ contains ' help [NAME(s)] ', & ' new NAME [--lib|--src] [--app] [--test] [--backfill] ', & ' list [--list] ', & - ' run [NAME(s)] [--release] [--runner "CMD"] [--list] ', & + ' run [[--target] NAME(s)] [--release] [--runner "CMD"] [--list] ', & ' [--compiler COMPILER_NAME] [-- ARGS] ', & - ' test [NAME(s)] [--release] [--runner "CMD"] [--list] ', & + ' test [[--target] NAME(s)] [--release] [--runner "CMD"] [--list] ', & ' [--compiler COMPILER_NAME] [-- ARGS] ', & ' '] help_usage=[character(len=80) :: & @@ -509,10 +509,10 @@ contains ' ', & ' Their syntax is ', & ' ', & - ' build [--release] [--list] [-compiler COMPILER_NAME] ', & + ' build [--release] [--list] [--compiler COMPILER_NAME] ', & ' new NAME [--lib|--src] [--app] [--test] [--backfill] ', & - ' run|test [NAME(s)] [--release] [--list] [--runner "CMD"] ', & - ' [--compiler COMPILER_NAME] [-- ARGS] ', & + ' run|test [[--target] NAME(s)] [--release] [--list] ', & + ' [--runner "CMD"] [--compiler COMPILER_NAME] [-- ARGS] ', & ' help [NAME(s)] ', & ' list [--list] ', & ' ', & @@ -609,7 +609,7 @@ contains ' # run default programs in /app or as specified in "fpm.toml" ', & ' # using the compiler command "f90". ', & - ' fpm run -compiler f90 ', & + ' fpm run --compiler f90 ', & ' ', & ' # run a specific program and pass arguments to the command ', & ' fpm run mytest -- -x 10 -y 20 --title "my title line" ', & @@ -625,7 +625,7 @@ contains ' build(1) - the fpm(1) subcommand to build a project ', & ' ', & 'SYNOPSIS ', & - ' fpm build [--release][-compiler COMPILER_NAME] [-list] ', & + ' fpm build [--release][--compiler COMPILER_NAME] [-list] ', & ' ', & ' fpm build --help|--version ', & ' ', & @@ -772,7 +772,7 @@ contains ' test(1) - the fpm(1) subcommand to run project tests ', & ' ', & 'SYNOPSIS ', & - ' fpm test [[--target] NAME(s)][--release][-compiler COMPILER_NAME ] ', & + ' fpm test [[--target] NAME(s)][--release][--compiler COMPILER_NAME ] ', & ' [--runner "CMD"] [--list][-- ARGS] ', & ' ', & ' fpm test --help|--version ', & @@ -803,7 +803,7 @@ contains ' fpm test ', & ' ', & ' # run using compiler command "f90" ', & - ' fpm test -compiler f90 ', & + ' fpm test --compiler f90 ', & ' ', & ' # run a specific test and pass arguments to the command ', & ' fpm test mytest -- -x 10 -y 20 --title "my title line" ', & diff --git a/fpm/src/fpm_compiler.f90 b/fpm/src/fpm_compiler.f90 index a16baa3..2dd520f 100644 --- a/fpm/src/fpm_compiler.f90 +++ b/fpm/src/fpm_compiler.f90 @@ -8,7 +8,7 @@ subroutine add_compile_flag_defaults(build_name,compiler,model) ! Choose compile flags based on cli settings & manifest inputs character(len=*),intent(in) :: build_name, compiler -type(fpm_model_t) :: model +type(fpm_model_t), intent(inout) :: model ! could just be a function to return a string instead of passing model ! but likely to change other components like matching C compiler |