simplify ext BLAS test; streamline adding preprocessor directives

Author: perazz

example_packages/metapackage_stdlib_extblas/app/main.f90

@@ -1,19 +1,13 @@
-! fortran-lang stdlib test case
-! This test program will only run if stdlib is properly built and linked to this project. 
+! fortran-lang stdlib + external BLAS test case
+! Program will fail if an external BLAS has not been linked against.
 program test_stdlib_metapackage
-
-    ! These USEs would not be possible if stdlib is not found 
-    use metapackage_stdlib, only: external_blas_test,external_lapack_test
+    use stdlib_linalg_constants, only: external_blas_ilp32,external_lapack_ilp32, &
+                                       external_blas_ilp64,external_lapack_ilp64
     implicit none
 
-    logical :: ext_blas,ext_lapack
-
-    call external_blas_test(ext_blas)
-    call external_lapack_test(ext_lapack)
-    
-    if (.not.ext_blas) then 
+    if (.not.(external_blas_ilp32 .or. external_blas_ilp64)) then 
         stop 1
-    elseif (.not.ext_lapack) then 
+    elseif (.not.(external_lapack_ilp32 .or. external_lapack_ilp64)) then 
         stop 2
     else
         stop 0

example_packages/metapackage_stdlib_extblas/src/metapackage_stdlib.f90

@@ -70,6 +70,9 @@ module fpm_manifest_dependency
 
         !> Print information on this instance
         procedure :: info
+        
+        !> Add a preprocessor configuration
+        procedure :: add_preprocess
 
         !> Serialization interface
         procedure :: serializable_is_same => dependency_is_same
@@ -561,6 +564,47 @@ pure subroutine resize_dependency_config(var, n)
         end if
 
     end subroutine resize_dependency_config
+    
+    subroutine add_preprocess(dep, preprocess)
+        !> Instance of the dependency config
+        class(dependency_config_t), intent(inout) :: dep
+        !> Instance of the preprocessor configuration
+        type(preprocess_config_t), intent(in) :: preprocess
+        
+        integer :: i,n
+        type(preprocess_config_t), allocatable :: new_preprocess(:)
+        
+        if (allocated(dep%preprocess)) then 
+            
+            n = size(dep%preprocess)
+            
+            if (n<1) then 
+                deallocate(dep%preprocess)
+                allocate(dep%preprocess(1),source=preprocess)
+            else
+                
+                find_similar: do i=1,n
+                    if (dep%preprocess(i)%name==dep%name) then                             
+                        call dep%preprocess(i)%add_config(preprocess)
+                        return                            
+                    end if
+                end do find_similar                   
+                
+                ! Similar preprocessor config not found: add a new one
+                allocate(new_preprocess(n+1))
+                new_preprocess(1:n) = dep%preprocess
+                new_preprocess(n+1) = preprocess
+                call move_alloc(from=new_preprocess,to=dep%preprocess)
+                
+            end if
+        else
+            
+            ! Copy configuration
+            allocate(dep%preprocess(1),source=preprocess)
+            
+        end if                
+               
+    end subroutine add_preprocess
 
 
 end module fpm_manifest_dependency

src/fpm/manifest/dependency.f90

@@ -57,6 +57,7 @@ subroutine init_stdlib(this,compiler,all_meta,error)
         if (with_blas) then 
             allocate(this%preprocess)
             call this%preprocess%new([string_t('STDLIB_EXTERNAL_BLAS'),string_t('STDLIB_EXTERNAL_LAPACK')])
+            call this%dependency(2)%add_preprocess(this%preprocess)
         end if
 
         ! Stdlib is not 100% thread safe. print a warning to the user