2 files changed, 5 insertions, 1 deletions
diff --git a/fpm.toml b/fpm.toml
index 1f28116..568754c 100644
--- a/fpm.toml
+++ b/fpm.toml
@@ -12,7 +12,7 @@ rev = "2f5eaba864ff630ba0c3791126a3f811b6e437f3"
 
 [dependencies.M_CLI2]
 git = "https://github.com/urbanjost/M_CLI2.git"
-rev = "1f3b922ce35f105d1a51869bed9a1013b5b552b6"
+rev = "ea6bbffc1c2fb0885e994d37ccf0029c99b19f24"
 
 [[test]]
 name = "cli-test"
diff --git a/src/fpm_environment.f90 b/src/fpm_environment.f90
index ef0177f..616af13 100644
--- a/src/fpm_environment.f90
+++ b/src/fpm_environment.f90
@@ -215,8 +215,12 @@ contains
                     write(stderr,'(*(g0,1x))')'<ERROR>*get_command_arguments_stack* error obtaining argument ',i
                     exit
                 elseif(ilength.gt.0)then
+                    !TODO! should escape or double quotes depending on system
+                    !TODO! on some systems might have to do more to requote
                     if(index(arg//' ','-').ne.1)then
                         args=args//quote//arg//quote//' '
+                    elseif(index(arg,' ').ne.0)then
+                        args=args//quote//arg//quote//' '
                     else
                         args=args//arg//' '
                     endif