Skip to content

Commit 0352130

Browse files
committed
Update install.f90
1 parent 5f82869 commit 0352130

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/fpm/cmd/install.f90

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ subroutine cmd_install(settings)
2929
type(build_target_ptr), allocatable :: targets(:), libraries(:)
3030
type(installer_t) :: installer
3131
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
3333
logical :: has_library, has_executables
3434
character(len=:), allocatable :: module_dir
3535
integer :: ntargets,i
@@ -42,8 +42,8 @@ subroutine cmd_install(settings)
4242

4343
! Set up logical variables to avoid repetitive conditions
4444
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
4747
has_library = allocated(package%library)
4848
has_executables = allocated(package%executable)
4949

@@ -62,7 +62,7 @@ subroutine cmd_install(settings)
6262
call install_info(output_unit, settings%list, targets, ntargets)
6363
if (settings%list) return
6464

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
6666

6767
if (.not.installable) then
6868
call fatal_error(error, "Project does not contain any installable targets")
@@ -78,7 +78,7 @@ subroutine cmd_install(settings)
7878
includedir=settings%includedir, moduledir=module_dir, &
7979
verbosity=merge(2, 1, settings%verbose))
8080

81-
if (has_library .and. install_library) then
81+
if (has_library .and. with_library) then
8282
call filter_library_targets(targets, libraries)
8383

8484
if (size(libraries) > 0) then
@@ -97,7 +97,7 @@ subroutine cmd_install(settings)
9797
call handle_error(error)
9898
end if
9999

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
101101

102102
call install_tests(installer, targets, error)
103103
call handle_error(error)

0 commit comments

Comments
 (0)