metapackage fix: clean before reading manifest, not after; refactor intel fix

Author: perazz

src/fpm.f90

@@ -317,20 +317,27 @@ subroutine new_compiler_flags(model,settings)
     type(fpm_build_settings), intent(in) :: settings
 
     character(len=:), allocatable :: flags, cflags, cxxflags, ldflags
-
-    if (len(settings%flag)>0) then
-        
+    logical :: release_profile
+    
+    if (allocated(settings%profile)) then 
+        release_profile = settings%profile == "release"
+    else
+        release_profile = .false.
+    end if
+    
+    if (.not.allocated(settings%flag)) then 
+        flags = model%compiler%get_default_flags(release_profile)
+    elseif (settings%flag == '') then
+        flags = model%compiler%get_default_flags(release_profile)
+    else
         flags = settings%flag
-        
-    elseif (allocated(settings%profile)) then 
-        
-        select case(settings%profile)
-        case("release")
-            flags = model%compiler%get_default_flags(release = .true.)
-        case ("debug")
-            flags = model%compiler%get_default_flags(release = .false.)
-        end select        
-    end if    
+        if (allocated(settings%profile)) then 
+            select case(settings%profile)
+            case("release", "debug")
+                flags = flags // model%compiler%get_default_flags(release_profile)
+            end select
+        endif
+    end if
 
     cflags   = trim(settings%cflag)
     cxxflags = trim(settings%cxxflag)

src/fpm/manifest/package.f90

@@ -133,6 +133,9 @@ subroutine new_package(self, table, root, error)
         type(toml_array), pointer :: children
         character(len=:), allocatable :: version, version_file
         integer :: ii, nn, stat, io
+        
+        ! Ensure metapackage data is initialized although off
+        call self%meta%reset()        
 
         call check(table, error)
         if (allocated(error)) return
@@ -219,9 +222,6 @@ subroutine new_package(self, table, root, error)
         call validate_profiles(self, error)
         if (allocated(error)) return
 
-        ! Ensure metapackage data is initialized although off
-        call self%meta%reset()
-        
     end subroutine new_package