targets: always initialize an output_dir

Author: perazz

src/fpm/cmd/export.f90

@@ -22,7 +22,6 @@ subroutine cmd_export(settings)
     type(fpm_model_t) :: model
     type(error_t), allocatable :: error
 
-    integer :: ii
     character(len=:), allocatable :: filename
 
     if (len_trim(settings%dump_manifest)<=0 .and. &

src/fpm_targets.f90

@@ -140,6 +140,9 @@ module fpm_targets
 
         !> Print information on this instance
         procedure :: info    
+        
+        !> Set output directory
+        procedure :: set_output_dir
 
         procedure :: is_executable_target
 
@@ -554,7 +557,7 @@ end subroutine collect_exe_link_dependencies
 
 !> Allocate a new target and append to target list
 subroutine add_target(targets, package, type, output_name, source, link_libraries, &
-        & features, preprocess, version)
+        & features, preprocess, version, output_dir)
     type(build_target_ptr), allocatable, intent(inout) :: targets(:)
     character(*), intent(in) :: package
     integer, intent(in) :: type
@@ -564,6 +567,7 @@ subroutine add_target(targets, package, type, output_name, source, link_librarie
     type(fortran_features_t), intent(in), optional :: features
     type(preprocess_config_t), intent(in), optional :: preprocess
     character(*), intent(in), optional :: version
+    character(*), intent(in), optional :: output_dir
 
     integer :: i
     type(build_target_t), pointer :: new_target
@@ -596,6 +600,9 @@ subroutine add_target(targets, package, type, output_name, source, link_librarie
     endif
     if (present(version)) new_target%version = version
     allocate(new_target%dependencies(0))
+    
+    call new_target%set_output_dir(output_dir)
+    
 
     targets = [targets, build_target_ptr(new_target)]
 
@@ -1010,9 +1017,8 @@ subroutine resolve_target_linking(targets, model, library, error)
             if (len(global_include_flags) > 0) then
                 target%compile_flags = target%compile_flags//global_include_flags
             end if
-            target%output_dir = get_output_dir(model%build_prefix, target%compile_flags)            
-            target%output_log_file = join_path(target%output_dir, target%output_name)//'.log'
-            target%output_file = join_path(target%output_dir, target%output_name)
+            
+            call target%set_output_dir(get_output_dir(model%build_prefix, target%compile_flags))
 
             ! Check shared build
             if (target%target_type==FPM_TARGET_SHARED) shared = .true.
@@ -1358,4 +1364,22 @@ function get_feature_flags(compiler, features) result(flags)
     end if
 end function get_feature_flags
 
+!> Helper function: update output directory of a target
+subroutine set_output_dir(self, output_dir)
+    class(build_target_t), intent(inout) :: self
+    character(*), optional, intent(in) :: output_dir
+
+    character(:), allocatable :: outdir
+
+    ! Normalize: if output_dir is empty, use no path
+    outdir = ""
+    if (present(output_dir)) outdir = trim(output_dir)
+        
+    self%output_dir = outdir
+    self%output_file = join_path(outdir, self%output_name)
+    self%output_log_file = self%output_file // ".log"
+
+end subroutine set_output_dir
+
+
 end module fpm_targets

test/fpm_test/test_backend.f90

@@ -355,10 +355,6 @@ function new_test_package() result(targets)
         call add_dependency(targets(2)%ptr,targets(4)%ptr)
         call add_dependency(targets(3)%ptr,targets(4)%ptr)
 
-        do i = 1, size(targets)
-          targets(i)%ptr%output_file = targets(i)%ptr%output_name
-        end do
-
     end function new_test_package
 
     subroutine compile_commands_roundtrip(error)
@@ -488,10 +484,6 @@ subroutine test_target_shared(error)
         call add_dependency(targets(1)%ptr, targets(2)%ptr)
         call add_dependency(targets(1)%ptr, targets(3)%ptr)
 
-        do i = 1, size(targets)
-            targets(i)%ptr%output_file = targets(i)%ptr%output_name
-        end do
-
         ! Perform topological sort
         do i = 1, size(targets)
             call sort_target(targets(i)%ptr)

test/fpm_test/test_installer.f90

@@ -8,6 +8,8 @@ module test_installer
     use fpm_environment, only : OS_WINDOWS, OS_LINUX
     use fpm_filesystem, only : join_path
     use fpm_installer
+    use fpm_targets, only: build_target_ptr, add_target, FPM_TARGET_ARCHIVE, &
+        FPM_TARGET_SHARED
     implicit none
     private
 
@@ -116,13 +118,18 @@ subroutine test_install_lib(error)
 
         type(mock_installer_t) :: mock
         type(installer_t) :: installer
+        type(build_target_ptr), allocatable :: targets(:)
 
         call new_installer(installer, prefix="PREFIX", verbosity=0, copy="mock")
         mock%installer_t = installer
         mock%expected_dir = join_path("PREFIX", "lib")
         mock%expected_run = 'mock "name" "'//join_path("PREFIX", "lib")//'"'
+        
+        call add_target(targets,"name",FPM_TARGET_ARCHIVE,"name")
 
-        call mock%install_library("name", error)
+        call mock%install_library(targets(1)%ptr, error)
+        
+        deallocate(targets(1)%ptr)
 
     end subroutine test_install_lib
 
@@ -131,16 +138,16 @@ subroutine test_install_pkgconfig(error)
         type(error_t), allocatable, intent(out) :: error
 
         type(mock_installer_t) :: mock
-        type(installer_t) :: installer
+        type(installer_t) :: installer        
 
         call new_installer(installer, prefix="PREFIX", verbosity=0, copy="mock")
         mock%installer_t = installer
         mock%os = OS_WINDOWS
         mock%expected_dir = "PREFIX\lib\pkgconfig"
         mock%expected_run = 'mock "name" "'//mock%expected_dir//'"'
-
+        
         call mock%install("name", "lib/pkgconfig", error)
-
+        
     end subroutine test_install_pkgconfig
 
     subroutine test_install_sitepackages(error)
@@ -184,13 +191,18 @@ subroutine test_install_shared_library_unix(error)
         type(mock_installer_t) :: mock
         type(installer_t) :: installer
         character(len=*), parameter :: libname = "libname.so"
+        type(build_target_ptr), allocatable :: targets(:)        
 
         call new_installer(installer, prefix="PREFIX", verbosity=0, copy="mock")
         mock%installer_t = installer
         mock%expected_dir = join_path("PREFIX", "lib")
         mock%expected_run = 'mock "'//libname//'" "'//mock%expected_dir//'"'
+        
+        call add_target(targets,"name",FPM_TARGET_SHARED,libname)
 
-        call mock%install_library(libname, error)
+        call mock%install_library(targets(1)%ptr, error)
+        
+        deallocate(targets(1)%ptr)
 
     end subroutine test_install_shared_library_unix