Skip to content

Commit e90eee7

Browse files
awvwgkLKedward
andauthored
Apply suggestions from code review
Co-authored-by: Laurence Kedward <[email protected]>
1 parent beaf9a8 commit e90eee7

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

src/fpm_backend.f90

-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ subroutine build_package(targets,model)
5555
type(string_t) :: temp
5656

5757
! Need to make output directory for include (mod) files
58-
!if (.not.exists(join_path(model%output_directory,model%package_name))) then
59-
!call mkdir(join_path(model%output_directory,model%package_name))
60-
!end if
6158
allocate(build_dirs(0))
6259
do i = 1, size(targets)
6360
associate(target => targets(i)%ptr)

src/fpm_targets.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ module fpm_targets
6969
!> File path of build target object relative to cwd
7070
character(:), allocatable :: output_file
7171

72-
!> File path of build target object relative to cwd
72+
!> File path of build target object relative to output_dir
7373
character(:), allocatable :: output_name
7474

75-
!> File path of build target object relative to cwd
75+
!> File path of output directory
7676
character(:), allocatable :: output_dir
7777

7878
!> Primary source for this build target

test/fpm_test/test_module_dependencies.f90

-9
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ subroutine test_library_module_use(error)
6666
type(fpm_model_t) :: model
6767
type(build_target_ptr), allocatable :: targets(:)
6868

69-
!model%output_directory = ''
7069
allocate(model%external_modules(0))
7170
allocate(model%packages(1))
7271
allocate(model%packages(1)%sources(2))
@@ -136,7 +135,6 @@ subroutine test_scope(exe_scope,error)
136135
type(build_target_ptr), allocatable :: targets(:)
137136
character(:), allocatable :: scope_str
138137

139-
!model%output_directory = ''
140138
allocate(model%external_modules(0))
141139
allocate(model%packages(1))
142140
allocate(model%packages(1)%sources(2))
@@ -195,7 +193,6 @@ subroutine test_program_with_module(error)
195193
type(fpm_model_t) :: model
196194
type(build_target_ptr), allocatable :: targets(:)
197195

198-
!model%output_directory = ''
199196
allocate(model%external_modules(0))
200197
allocate(model%packages(1))
201198
allocate(model%packages(1)%sources(1))
@@ -249,7 +246,6 @@ subroutine test_scope(exe_scope,error)
249246
type(build_target_ptr), allocatable :: targets(:)
250247
character(:), allocatable :: scope_str
251248

252-
!model%output_directory = ''
253249
allocate(model%external_modules(0))
254250
allocate(model%packages(1))
255251
allocate(model%packages(1)%sources(3))
@@ -309,7 +305,6 @@ subroutine test_missing_library_use(error)
309305
type(fpm_model_t) :: model
310306
type(build_target_ptr), allocatable :: targets(:)
311307

312-
!model%output_directory = ''
313308
allocate(model%external_modules(0))
314309
allocate(model%packages(1))
315310
allocate(model%packages(1)%sources(2))
@@ -337,7 +332,6 @@ subroutine test_missing_program_use(error)
337332
type(fpm_model_t) :: model
338333
type(build_target_ptr), allocatable :: targets(:)
339334

340-
!model%output_directory = ''
341335
allocate(model%external_modules(0))
342336
allocate(model%packages(1))
343337
allocate(model%packages(1)%sources(2))
@@ -364,7 +358,6 @@ subroutine test_invalid_library_use(error)
364358
type(fpm_model_t) :: model
365359
type(build_target_ptr), allocatable :: targets(:)
366360

367-
!model%output_directory = ''
368361
allocate(model%external_modules(0))
369362
allocate(model%packages(1))
370363
allocate(model%packages(1)%sources(2))
@@ -392,7 +385,6 @@ subroutine test_subdirectory_module_use(error)
392385
type(fpm_model_t) :: model
393386
type(build_target_ptr), allocatable :: targets(:)
394387

395-
!model%output_directory = ''
396388
allocate(model%external_modules(0))
397389
allocate(model%packages(1))
398390
allocate(model%packages(1)%sources(2))
@@ -512,7 +504,6 @@ subroutine test_invalid_subdirectory_module_use(error)
512504
type(fpm_model_t) :: model
513505
type(build_target_ptr), allocatable :: targets(:)
514506

515-
!model%output_directory = ''
516507
allocate(model%external_modules(0))
517508
allocate(model%packages(1))
518509
allocate(model%packages(1)%sources(2))

0 commit comments

Comments
 (0)