diff options
| -rw-r--r-- | src/fpm_backend.f90 | 3 | ||||
| -rw-r--r-- | src/fpm_targets.f90 | 4 | ||||
| -rw-r--r-- | test/fpm_test/test_module_dependencies.f90 | 9 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/fpm_backend.f90 b/src/fpm_backend.f90 index 1838c3a..6cf4f2d 100644 --- a/src/fpm_backend.f90 +++ b/src/fpm_backend.f90 @@ -55,9 +55,6 @@ subroutine build_package(targets,model) type(string_t) :: temp ! Need to make output directory for include (mod) files - !if (.not.exists(join_path(model%output_directory,model%package_name))) then - !call mkdir(join_path(model%output_directory,model%package_name)) - !end if allocate(build_dirs(0)) do i = 1, size(targets) associate(target => targets(i)%ptr) diff --git a/src/fpm_targets.f90 b/src/fpm_targets.f90 index c7ac8bb..788a5ce 100644 --- a/src/fpm_targets.f90 +++ b/src/fpm_targets.f90 @@ -69,10 +69,10 @@ type build_target_t !> File path of build target object relative to cwd character(:), allocatable :: output_file - !> File path of build target object relative to cwd + !> File path of build target object relative to output_dir character(:), allocatable :: output_name - !> File path of build target object relative to cwd + !> File path of output directory character(:), allocatable :: output_dir !> Primary source for this build target diff --git a/test/fpm_test/test_module_dependencies.f90 b/test/fpm_test/test_module_dependencies.f90 index 8dcf86d..53256be 100644 --- a/test/fpm_test/test_module_dependencies.f90 +++ b/test/fpm_test/test_module_dependencies.f90 @@ -66,7 +66,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -136,7 +135,6 @@ contains type(build_target_ptr), allocatable :: targets(:) character(:), allocatable :: scope_str - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -195,7 +193,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(1)) @@ -249,7 +246,6 @@ contains type(build_target_ptr), allocatable :: targets(:) character(:), allocatable :: scope_str - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(3)) @@ -309,7 +305,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -337,7 +332,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -364,7 +358,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -392,7 +385,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -512,7 +504,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) |