@@ -85,7 +85,7 @@ subroutine add_dependencies(dependency_list)
85
85
character (:), allocatable :: dependency_path
86
86
87
87
do i= 1 ,size (dependency_list)
88
-
88
+
89
89
if (dependency_list(i)% name .in . package_list) then
90
90
cycle
91
91
end if
@@ -100,7 +100,7 @@ subroutine add_dependencies(dependency_list)
100
100
end if
101
101
102
102
else if (allocated (dependency_list(i)% path)) then
103
-
103
+
104
104
dependency_path = join_path(package_root,dependency_list(i)% path)
105
105
106
106
end if
@@ -121,11 +121,11 @@ subroutine add_dependencies(dependency_list)
121
121
dependency% library% source_dir = " src"
122
122
end if
123
123
124
-
124
+
125
125
call add_libsources_from_package(sources,link_libraries,package_list,dependency, &
126
126
package_root= dependency_path, &
127
127
dev_depends= .false. , error= error)
128
-
128
+
129
129
if (allocated (error)) then
130
130
error% message = ' Error while processing sources for dependency package "' // &
131
131
new_line(' a' )// dependency% name// ' "' // &
@@ -358,7 +358,7 @@ subroutine cmd_run(settings,test)
358
358
exe_source = > exe_target% dependencies(1 )% ptr% source
359
359
360
360
if (exe_source% unit_scope == &
361
- merge (FPM_SCOPE_TEST,FPM_SCOPE_APP,test)) then
361
+ merge (FPM_SCOPE_TEST,FPM_SCOPE_APP,test)) then
362
362
363
363
col_width = max (col_width,len (basename(exe_target% output_file))+ 2 )
364
364
@@ -372,7 +372,7 @@ subroutine cmd_run(settings,test)
372
372
do j= 1 ,size (settings% name)
373
373
374
374
if (trim (settings% name (j))==exe_source% exe_name) then
375
-
375
+
376
376
found(j) = .true.
377
377
exe_cmd% s = exe_target% output_file
378
378
executables = [executables, exe_cmd]
@@ -382,7 +382,7 @@ subroutine cmd_run(settings,test)
382
382
end do
383
383
384
384
end if
385
-
385
+
386
386
end if
387
387
388
388
end if
@@ -415,14 +415,14 @@ subroutine cmd_run(settings,test)
415
415
do i= 1 ,size (model% targets)
416
416
417
417
exe_target = > model% targets(i)% ptr
418
-
418
+
419
419
if (exe_target% target_type == FPM_TARGET_EXECUTABLE .and. &
420
420
allocated (exe_target% dependencies)) then
421
421
422
422
exe_source = > exe_target% dependencies(1 )% ptr% source
423
423
424
424
if (exe_source% unit_scope == &
425
- merge (FPM_SCOPE_TEST,FPM_SCOPE_APP,test)) then
425
+ merge (FPM_SCOPE_TEST,FPM_SCOPE_APP,test)) then
426
426
427
427
write (stderr,' (A)' ,advance= (merge (" yes" ," no " ,modulo (j,nCol)==0 ))) &
428
428
& [character (len= col_width) :: basename(exe_target% output_file)]
@@ -451,13 +451,13 @@ subroutine cmd_run(settings,test)
451
451
if (settings% list) then
452
452
write (stderr,* ) executables(i)% s
453
453
else
454
-
454
+
455
455
if (exists(executables(i)% s)) then
456
- if (settings% runner .ne. ' ' )then
456
+ if (settings% runner .ne. ' ' )then
457
457
call run(settings% runner// ' ' // executables(i)% s// " " // settings% args)
458
- else
458
+ else
459
459
call run(executables(i)% s// " " // settings% args)
460
- endif
460
+ endif
461
461
else
462
462
write (stderr,* )' fpm::run<ERROR>' ,executables(i)% s,' not found'
463
463
stop 1
0 commit comments