move add_strings to fpm_strings

Author: perazz

src/fpm_strings.f90

@@ -43,7 +43,7 @@ module fpm_strings
 
 private
 public :: f_string, lower, upper, split, split_first_last, split_lines_first_last, str_ends_with, string_t, str_begins_with_str
-public :: to_fortran_name, is_fortran_name
+public :: to_fortran_name, is_fortran_name, add_strings
 public :: string_array_contains, string_cat, len_trim, operator(.in.), fnv_1a
 public :: replace, resize, str, join, glob
 public :: notabs, dilate, remove_newline_characters, remove_characters_in_set
@@ -99,6 +99,11 @@ module fpm_strings
     module procedure string_arrays_same
 end interface
 
+interface add_strings
+    module procedure add_strings_one
+    module procedure add_strings_many
+end interface add_strings
+
 contains
 
 !> test if a CHARACTER string ends with a specified suffix
@@ -1659,4 +1664,55 @@ function dilate(instr) result(outstr)
 
 end function dilate
 
+!> Add one element to a string array with a loop (gcc-15 bug on array initializer)
+pure subroutine add_strings_one(list,new)
+    type(string_t), allocatable, intent(inout) :: list(:)
+    type(string_t), intent(in) :: new
+
+    integer :: i,n
+    type(string_t), allocatable :: tmp(:)
+
+    if (allocated(list)) then 
+       n = size(list)
+    else
+       n = 0
+    endif     
+
+    allocate(tmp(n+1))
+    do i=1,n
+       tmp(i) = list(i)
+    end do   
+    tmp(n+1) = new
+    call move_alloc(from=tmp,to=list)
+
+end subroutine add_strings_one       
+
+!> Add elements to a string array with a loop (gcc-15 bug on array initializer)
+pure subroutine add_strings_many(list,new)
+    type(string_t), allocatable, intent(inout) :: list(:)
+    type(string_t), intent(in) :: new(:)
+
+    integer :: i,n,add
+    type(string_t), allocatable :: tmp(:)
+
+    if (allocated(list)) then 
+       n = size(list)
+    else
+       n = 0
+    endif     
+
+    add = size(new)
+    if (add<=0) return
+
+    allocate(tmp(n+add))
+    do i=1,n
+       tmp(i) = list(i)
+    end do   
+    do i=1,add
+       tmp(n+i) = new(i)
+    end do   
+    call move_alloc(from=tmp,to=list)
+
+end subroutine add_strings_many  
+
 end module fpm_strings

src/fpm_targets.f90

@@ -30,7 +30,8 @@ module fpm_targets
 use fpm_compiler, only : compiler_t
 use fpm_environment, only: get_os_type, OS_WINDOWS, OS_MACOS, library_filename
 use fpm_filesystem, only: dirname, join_path, canon_path
-use fpm_strings, only: string_t, operator(.in.), string_cat, fnv_1a, resize, lower, str_ends_with
+use fpm_strings, only: string_t, operator(.in.), string_cat, fnv_1a, resize, lower, str_ends_with, &
+    add_strings
 use fpm_compiler, only: get_macros
 use fpm_sources, only: get_exe_name_with_suffix
 use fpm_manifest_library, only: library_config_t
@@ -437,9 +438,9 @@ subroutine build_target_list(targets,model,library)
                     if (.not. ("stdc++" .in. model%link_libraries)) then
 
                         if (get_os_type() == OS_MACOS) then
-                            model%link_libraries = [model%link_libraries, string_t("c++")]
+                            call add_strings(model%link_libraries, string_t("c++"))
                         else
-                            model%link_libraries = [model%link_libraries, string_t("stdc++")]
+                            call add_strings(model%link_libraries, string_t("stdc++"))
                         end if
 
                     end if

src/metapackage/fpm_meta_util.f90

@@ -1,7 +1,7 @@
 module fpm_meta_util
     use fpm_meta_base, only: metapackage_t, destroy
     use fpm_filesystem, only: join_path
-    use fpm_strings, only: split, string_t, str_begins_with_str
+    use fpm_strings, only: split, string_t, str_begins_with_str, add_strings
     use fpm_error, only: error_t
     use fpm_versioning, only: new_version
     use fpm_pkg_config, only: pkgcfg_get_libs, pkgcfg_get_build_flags, pkgcfg_get_version
@@ -12,11 +12,6 @@ module fpm_meta_util
 
     public :: add_pkg_config_compile_options, lib_get_trailing, add_strings
 
-    interface add_strings
-        module procedure add_strings_one
-        module procedure add_strings_many
-    end interface add_strings
-
     contains
 
     !> Add pkgconfig compile options to a metapackage
@@ -125,55 +120,4 @@ subroutine lib_get_trailing(lib_name,lib_dir,prefix,suffix,found)
 
     end subroutine lib_get_trailing
 
-    !> Add one element to a string array with a loop (gcc-15 bug on array initializer)
-    pure subroutine add_strings_one(list,new)
-        type(string_t), allocatable, intent(inout) :: list(:)
-        type(string_t), intent(in) :: new
-
-        integer :: i,n
-        type(string_t), allocatable :: tmp(:)
-
-        if (allocated(list)) then 
-           n = size(list)
-        else
-           n = 0
-        endif     
-
-        allocate(tmp(n+1))
-        do i=1,n
-           tmp(i) = list(i)
-        end do   
-        tmp(n+1) = new
-        call move_alloc(from=tmp,to=list)
-
-    end subroutine add_strings_one       
-    
-    !> Add elements to a string array with a loop (gcc-15 bug on array initializer)
-    pure subroutine add_strings_many(list,new)
-        type(string_t), allocatable, intent(inout) :: list(:)
-        type(string_t), intent(in) :: new(:)
-
-        integer :: i,n,add
-        type(string_t), allocatable :: tmp(:)
-
-        if (allocated(list)) then 
-           n = size(list)
-        else
-           n = 0
-        endif     
-
-        add = size(new)
-        if (add<=0) return
-
-        allocate(tmp(n+add))
-        do i=1,n
-           tmp(i) = list(i)
-        end do   
-        do i=1,add
-           tmp(n+i) = new(i)
-        end do   
-        call move_alloc(from=tmp,to=list)
-
-    end subroutine add_strings_many     
-    
 end module fpm_meta_util