export .def and import library on Windows

Author: perazz

src/fpm/cmd/install.f90

@@ -26,7 +26,7 @@ subroutine cmd_install(settings)
     type(package_config_t) :: package
     type(error_t), allocatable :: error
     type(fpm_model_t) :: model
-    type(build_target_ptr), allocatable :: targets(:)
+    type(build_target_ptr), allocatable :: targets(:), libraries(:)
     type(installer_t) :: installer
     type(string_t), allocatable :: list(:)
     logical :: installable
@@ -62,11 +62,11 @@ subroutine cmd_install(settings)
       verbosity=merge(2, 1, settings%verbose))
 
     if (allocated(package%library) .and. package%install%library) then
-      call filter_library_targets(targets, list)
+      call filter_library_targets(targets, libraries)
 
-      if (size(list) > 0) then
-        do i=1,size(list)
-           call installer%install_library(list(i)%s, error)
+      if (size(libraries) > 0) then
+        do i=1,size(libraries)
+           call installer%install_library(libraries(i)%ptr, error)
            call handle_error(error)
         end do
 
@@ -97,11 +97,12 @@ subroutine install_info(unit, verbose, targets, ntargets)
 
     integer :: ii
     type(string_t), allocatable :: install_target(:), temp(:)
+    type(build_target_ptr), allocatable :: libs(:)
 
     allocate(install_target(0))
 
-    call filter_library_targets(targets, temp)
-    install_target = [install_target, temp]
+    call filter_library_targets(targets, libs)
+    install_target = [install_target, (string_t(libs(ii)%ptr%output_file),ii=1,size(libs))]
 
     call filter_executable_targets(targets, FPM_SCOPE_APP, temp)
     install_target = [install_target, temp]

src/fpm/installer.f90

@@ -5,8 +5,9 @@
 !> to any directory within the prefix.
 module fpm_installer
   use, intrinsic :: iso_fortran_env, only : output_unit
-  use fpm_environment, only : get_os_type, os_is_unix
+  use fpm_environment, only : get_os_type, os_is_unix, OS_WINDOWS
   use fpm_error, only : error_t, fatal_error
+  use fpm_targets, only: build_target_t, FPM_TARGET_ARCHIVE, FPM_TARGET_SHARED, FPM_TARGET_NAME
   use fpm_filesystem, only : join_path, mkdir, exists, unix_path, windows_path, get_local_prefix
 
   implicit none
@@ -193,12 +194,46 @@ end subroutine install_executable
   subroutine install_library(self, library, error)
     !> Instance of the installer
     class(installer_t), intent(inout) :: self
-    !> Path to the library
-    character(len=*), intent(in) :: library
+    !> Library target    
+    type(build_target_t), intent(in) :: library
     !> Error handling
     type(error_t), allocatable, intent(out) :: error
-
-    call self%install(library, self%libdir, error)
+    
+    character(:), allocatable :: def_file, implib_file
+    
+    select case (library%target_type)
+       case (FPM_TARGET_ARCHIVE)
+          call self%install(library%output_file, self%libdir, error)
+       case (FPM_TARGET_SHARED)
+          call self%install(library%output_file, self%libdir, error)
+          
+          ! Handle shared library side-files only on Windows
+          if (self%os==OS_WINDOWS) then 
+            
+            ! Install .def if it exists
+            def_file      = join_path(library%output_dir, library%package_name // ".def")
+            if (exists(def_file)) call self%install(def_file, self%libdir, error)
+            if (allocated(error)) return            
+
+            ! Try both compiler-dependent import library names
+            implib_file = join_path(library%output_dir, library%package_name // ".dll.a")           
+            if (exists(implib_file)) then 
+                call self%install(implib_file, self%libdir, error)            
+                if (allocated(error)) return
+            else
+                implib_file = join_path(library%output_dir, library%package_name // ".lib")
+                if (exists(implib_file)) call self%install(implib_file, self%libdir, error)            
+                if (allocated(error)) return
+            endif
+
+          end if
+          
+       case default 
+          call fatal_error(error,"Installer error: "//library%package_name//" is a "// &
+                                 FPM_TARGET_NAME(library%target_type)//", not a library")
+          return        
+    end select
+    
   end subroutine install_library
 
   !> Install a test program in its correct subdirectory

src/fpm_targets.f90

@@ -1254,23 +1254,29 @@ function get_output_dir(build_prefix, args) result(path)
     path = build_prefix//"_"//build_hash
 end function get_output_dir
 
-
+!> Returns pointers to all library targets
 subroutine filter_library_targets(targets, list)
     type(build_target_ptr), intent(in) :: targets(:)
-    type(string_t), allocatable, intent(out) :: list(:)
+    type(build_target_ptr), allocatable, intent(out) :: list(:)
 
     integer :: i, n
+    
+    n = 0
+    do i = 1, size(targets)
+        if (any(targets(i)%ptr%target_type == [FPM_TARGET_ARCHIVE,FPM_TARGET_SHARED])) then
+            n = n + 1
+        end if
+    end do    
+    
+    allocate(list(n))
 
     n = 0
-    call resize(list)
     do i = 1, size(targets)
         if (any(targets(i)%ptr%target_type == [FPM_TARGET_ARCHIVE,FPM_TARGET_SHARED])) then
-            if (n >= size(list)) call resize(list)
             n = n + 1
-            list(n)%s = targets(i)%ptr%output_file
+            list(n)%ptr => targets(i)%ptr
         end if
     end do
-    call resize(list, n)
 end subroutine filter_library_targets
 
 subroutine filter_executable_targets(targets, scope, list)