Avoid empty and duplicate paths

Author: krystophny

src/metapackage/fpm_meta_base.f90

@@ -5,7 +5,7 @@ module fpm_meta_base
     use fpm_command_line, only: fpm_cmd_settings, fpm_run_settings
     use fpm_manifest_dependency, only: dependency_config_t
     use fpm_manifest, only: package_config_t
-    use fpm_strings, only: string_t, len_trim
+    use fpm_strings, only: string_t, len_trim, split, join
 
     implicit none
 
@@ -111,30 +111,30 @@ subroutine resolve_model(self,model,error)
 
         ! Add global build flags, to apply to all sources
         if (self%has_build_flags) then
-            model%fortran_compile_flags = model%fortran_compile_flags//self%flags%s
-            model%c_compile_flags       = model%c_compile_flags//self%flags%s
-            model%cxx_compile_flags     = model%cxx_compile_flags//self%flags%s
+            call append_flags_without_duplicates(model%fortran_compile_flags, self%flags%s)
+            call append_flags_without_duplicates(model%c_compile_flags, self%flags%s)
+            call append_flags_without_duplicates(model%cxx_compile_flags, self%flags%s)
         endif
 
         ! Add language-specific flags
-        if (self%has_fortran_flags) model%fortran_compile_flags = model%fortran_compile_flags//self%fflags%s
-        if (self%has_c_flags)       model%c_compile_flags       = model%c_compile_flags//self%cflags%s
-        if (self%has_cxx_flags)     model%cxx_compile_flags     = model%cxx_compile_flags//self%cxxflags%s
+        if (self%has_fortran_flags) call append_flags_without_duplicates(model%fortran_compile_flags, self%fflags%s)
+        if (self%has_c_flags)       call append_flags_without_duplicates(model%c_compile_flags, self%cflags%s)
+        if (self%has_cxx_flags)     call append_flags_without_duplicates(model%cxx_compile_flags, self%cxxflags%s)
 
         if (self%has_link_flags) then
-            model%link_flags            = model%link_flags//' '//self%link_flags%s
+            call append_flags_without_duplicates(model%link_flags, self%link_flags%s)
         end if
 
         if (self%has_link_libraries) then
-            model%link_libraries        = [model%link_libraries,self%link_libs]
+            call append_array_without_duplicates(model%link_libraries, self%link_libs)
         end if
 
         if (self%has_include_dirs) then
-            model%include_dirs          = [model%include_dirs,self%incl_dirs]
+            call append_array_without_duplicates(model%include_dirs, self%incl_dirs)
         end if
 
         if (self%has_external_modules) then
-            model%external_modules      = [model%external_modules,self%external_modules]
+            call append_array_without_duplicates(model%external_modules, self%external_modules)
         end if
 
     end subroutine resolve_model
@@ -185,6 +185,72 @@ pure function dn(bool)
            end if
         end function dn
 
-
     end subroutine resolve_package_config
+
+    subroutine append_flags_without_duplicates(flags, new_flags)
+        character(:), intent(inout), allocatable :: flags
+        character(*), intent(in) :: new_flags
+
+        character(len=:), allocatable :: flags_array(:), new_flags_array(:)
+        type(string_t), allocatable :: flags_str_array(:), new_flags_str_array(:)
+        integer :: i, max_len
+
+        call split(flags, flags_array, " ")
+        call split(new_flags, new_flags_array, " ")
+
+        allocate(flags_str_array(size(flags_array, 1)))
+        allocate(new_flags_str_array(size(new_flags_array, 1)))
+        do i = 1, size(flags_array)
+            flags_str_array(i) = string_t(flags_array(i))
+        end do
+        do i = 1, size(new_flags_array)
+            new_flags_str_array(i) = string_t(new_flags_array(i))
+        end do
+
+        call append_array_without_duplicates(flags_str_array, new_flags_str_array)
+
+        max_len = 0
+        do i = 1, size(flags_str_array)
+            max_len = max(max_len, len_trim(flags_str_array(i)%s))
+        end do
+        deallocate(flags_array)
+        allocate(character(len=max_len) :: flags_array(size(flags_str_array)))
+        do i = 1, size(flags_str_array)
+            flags_array(i) = flags_str_array(i)%s
+        end do
+
+        flags = join(flags_array, " ")
+
+    end subroutine append_flags_without_duplicates
+
+    subroutine append_array_without_duplicates(str_array, new_elements)
+        type(string_t), allocatable, intent(inout) :: str_array(:)
+        type(string_t), intent(in) :: new_elements(:)
+        integer :: i
+
+        do i = 1, size(new_elements)
+            if (contains_element(str_array, new_elements(i))) cycle
+            ! Filter out empty flags
+            if (new_elements(i)%s == "") cycle
+            if (new_elements(i)%s == "-l") cycle
+            if (new_elements(i)%s == "-L") cycle
+            if (new_elements(i)%s == "-I") cycle
+            if (new_elements(i)%s == "-J") cycle
+            str_array = [str_array, new_elements(i)]
+        end do
+    end subroutine append_array_without_duplicates
+
+    function contains_element(str_array, element)
+        logical :: contains_element
+        type(string_t), intent(in) :: str_array(:), element
+        integer :: i
+
+        contains_element = .false.
+        do i = 1, size(str_array)
+            if (str_array(i)%s == element%s) then
+                contains_element = .true.
+                exit
+            end if
+        end do
+    end function contains_element
 end module fpm_meta_base

src/metapackage/fpm_meta_util.f90

@@ -21,10 +21,10 @@ subroutine add_pkg_config_compile_options(this, name, include_flag, libdir, erro
         character(len=*), intent(in) :: include_flag
         type(error_t), allocatable, intent(out) :: error
 
-        character(len=:), allocatable :: libdir, ext, pref
-        type(string_t) :: log, this_lib
+        character(len=:), allocatable :: libdir
+        type(string_t) :: log, current_include_dir, current_lib
         type(string_t), allocatable :: libs(:), flags(:)
-        integer :: i
+        integer :: i, j
 
         !> Get version
         if (.not. allocated(this%version)) then
@@ -42,8 +42,10 @@ subroutine add_pkg_config_compile_options(this, name, include_flag, libdir, erro
         libdir = ""
         do i = 1, size(libs)
             if (str_begins_with_str(libs(i)%s, '-l')) then
+                current_lib = string_t(libs(i)%s(3:))
+                if (len_trim(current_lib%s) == 0) cycle
                 this%has_link_libraries = .true.
-                this%link_libs = [this%link_libs, string_t(libs(i)%s(3:))]
+                this%link_libs = [this%link_libs, current_lib]
             else ! -L and others: concatenate
                 this%has_link_flags = .true.
                 this%link_flags = string_t(trim(this%link_flags%s)//' '//libs(i)%s)
@@ -63,8 +65,10 @@ subroutine add_pkg_config_compile_options(this, name, include_flag, libdir, erro
 
         do i = 1, size(flags)
             if (str_begins_with_str(flags(i)%s, include_flag)) then
+                current_include_dir = string_t(flags(i)%s(len(include_flag)+1:))
+                if (len_trim(current_include_dir%s) == 0) cycle
                 this%has_include_dirs = .true.
-                this%incl_dirs = [this%incl_dirs, string_t(flags(i)%s(len(include_flag)+1:))]
+                this%incl_dirs = [this%incl_dirs, current_include_dir]
             else
                 this%has_build_flags = .true.
                 this%flags = string_t(trim(this%flags%s)//' '//flags(i)%s)