Skip to content

Commit 0c792c2

Browse files
authored
Merge branch 'fortran-lang:main' into metapackage_netcdf
2 parents 5dd6013 + 7535cab commit 0c792c2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

fpm.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ fortran-regex.git = "https://github.com/perazz/fortran-regex"
2020
fortran-regex.tag = "1.1.2"
2121
jonquil.git = "https://github.com/toml-f/jonquil"
2222
jonquil.rev = "4fbd4cf34d577c0fd25e32667ee9e41bf231ece8"
23-
fortran-shlex.git = "https://github.com/itpplasma/fortran-shlex" # TODO: Change back to perazz
24-
fortran-shlex.tag = "main" # TODO: Change back to 1.2.x
23+
fortran-shlex.git = "https://github.com/perazz/fortran-shlex"
24+
fortran-shlex.tag = "1.2.1"
2525

2626
[[test]]
2727
name = "cli-test"

src/metapackage/fpm_meta_util.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ subroutine add_pkg_config_compile_options(this, name, include_flag, libdir, erro
2424
character(len=:), allocatable :: libdir
2525
type(string_t) :: log, current_include_dir, current_lib
2626
type(string_t), allocatable :: libs(:), flags(:)
27-
integer :: i, j
27+
integer :: i
2828

2929
!> Get version
3030
if (.not. allocated(this%version)) then

0 commit comments

Comments
 (0)