diff options
| author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-09-27 13:07:21 +0100 |
|---|---|---|
| committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-09-28 09:46:04 +0100 |
| commit | 64a0f72db4080c2ca18e8ba7bbad5825c02ab079 (patch) | |
| tree | 7191571e7424c303ec957f09a49e685a373a8a72 | |
| parent | 72dab19de88c2d31deccad2e6f988fb85e614190 (diff) | |
| download | fpm-64a0f72db4080c2ca18e8ba7bbad5825c02ab079.tar.gz fpm-64a0f72db4080c2ca18e8ba7bbad5825c02ab079.zip | |
Retain source file structure in object files
| -rw-r--r-- | fpm/src/fpm_backend.f90 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fpm/src/fpm_backend.f90 b/fpm/src/fpm_backend.f90 index 40460d7..d7005bf 100644 --- a/fpm/src/fpm_backend.f90 +++ b/fpm/src/fpm_backend.f90 @@ -3,7 +3,7 @@ module fpm_backend ! Implements the native fpm build backend use fpm_environment, only: run, get_os_type, OS_WINDOWS -use fpm_filesystem, only: basename, join_path, exists, mkdir +use fpm_filesystem, only: basename, dirname, join_path, exists, mkdir use fpm_model, only: fpm_model_t, srcfile_t, FPM_UNIT_MODULE, & FPM_UNIT_SUBMODULE, FPM_UNIT_SUBPROGRAM, & FPM_UNIT_CSOURCE, FPM_UNIT_PROGRAM, & @@ -113,6 +113,10 @@ recursive subroutine build_source(model,source_file,linking) object_file = get_object_name(model,source_file%file_name) + if (.not.exists(dirname(object_file))) then + call mkdir(dirname(object_file)) + end if + call run("gfortran -c " // source_file%file_name // model%fortran_compile_flags & // " -o " // object_file) linking = linking // " " // object_file @@ -145,13 +149,6 @@ function get_object_name(model,source_file_name) result(object_file) ! Exclude first directory level from path object_file = source_file_name(index(source_file_name,filesep)+1:) - ! Convert remaining directory separators to underscores - i = index(object_file,filesep) - do while(i > 0) - object_file(i:i) = '_' - i = index(object_file,filesep) - end do - ! Construct full target path object_file = join_path(model%output_directory, model%package_name, & object_file//'.o') |