@@ -29,7 +29,7 @@ subroutine cmd_install(settings)
29
29
type (build_target_ptr), allocatable :: targets(:), libraries(:)
30
30
type (installer_t) :: installer
31
31
type (string_t), allocatable :: list(:)
32
- logical :: installable, has_install_config, install_library, install_tests
32
+ logical :: installable, has_install_config, with_library, with_tests
33
33
logical :: has_library, has_executables
34
34
character (len= :), allocatable :: module_dir
35
35
integer :: ntargets,i
@@ -42,8 +42,8 @@ subroutine cmd_install(settings)
42
42
43
43
! Set up logical variables to avoid repetitive conditions
44
44
has_install_config = allocated (package% install)
45
- install_library = has_install_config .and. package% install% library
46
- install_tests = has_install_config .and. package% install% test
45
+ with_library = has_install_config .and. package% install% library
46
+ with_tests = has_install_config .and. package% install% test
47
47
has_library = allocated (package% library)
48
48
has_executables = allocated (package% executable)
49
49
@@ -62,7 +62,7 @@ subroutine cmd_install(settings)
62
62
call install_info(output_unit, settings% list, targets, ntargets)
63
63
if (settings% list) return
64
64
65
- installable = (has_library .and. install_library ) .or. has_executables .or. ntargets> 0
65
+ installable = (has_library .and. with_library ) .or. has_executables .or. ntargets> 0
66
66
67
67
if (.not. installable) then
68
68
call fatal_error(error, " Project does not contain any installable targets" )
@@ -78,7 +78,7 @@ subroutine cmd_install(settings)
78
78
includedir= settings% includedir, moduledir= module_dir, &
79
79
verbosity= merge (2 , 1 , settings% verbose))
80
80
81
- if (has_library .and. install_library ) then
81
+ if (has_library .and. with_library ) then
82
82
call filter_library_targets(targets, libraries)
83
83
84
84
if (size (libraries) > 0 ) then
@@ -97,7 +97,7 @@ subroutine cmd_install(settings)
97
97
call handle_error(error)
98
98
end if
99
99
100
- if (allocated (package% test) .and. (install_tests .or. model% include_tests)) then
100
+ if (allocated (package% test) .and. (with_tests .or. model% include_tests)) then
101
101
102
102
call install_tests(installer, targets, error)
103
103
call handle_error(error)
0 commit comments