Merge branch 'main' into flang_new_support

Author: perazz

ci/run_tests.sh

@@ -344,5 +344,27 @@ pushd static_app_only
 test $EXIT_CODE -eq 0
 popd
 
+# Test custom module directory
+pushd custom_module_dir
+"$fpm" build
+rm -rf ./test_custom_install
+"$fpm" install --prefix ./test_custom_install
+# Verify modules are installed in custom directory
+test -f ./test_custom_install/custom_modules/greeting.mod
+test -f ./test_custom_install/custom_modules/math_utils.mod
+# Verify library is still installed normally
+test -f ./test_custom_install/lib/libcustom-module-dir.a
+# Clean up
+rm -rf ./test_custom_install
+popd
+
+# Test both shared and static library types
+pushd both_lib_types
+"$fpm" build
+"$fpm" install --prefix=.
+# Check that exactly 2 libboth_lib_types library files were installed
+test $(ls lib/libboth_lib_types* | wc -l) -eq 2
+popd
+
 # Cleanup
 rm -rf ./*/build

example_packages/both_lib_types/fpm.toml

@@ -0,0 +1,3 @@
+name = "both_lib_types"
+library.type=["shared", "static"]
+install.library=true

example_packages/both_lib_types/src/both_lib_types.f90

@@ -0,0 +1,15 @@
+module both_lib_types
+  implicit none
+  private
+
+  public :: say_hello
+  public :: get_number
+contains
+  subroutine say_hello
+    print *, "Hello from both_lib_types!"
+  end subroutine say_hello
+  
+  integer function get_number()
+     get_number = 42
+  end function get_number
+end module both_lib_types

example_packages/custom_module_dir/README.md

@@ -0,0 +1,32 @@
+# Custom Module Directory Example
+
+This example demonstrates the use of a custom module directory in the `[install]` section of `fpm.toml`.
+
+## Features
+
+- Two simple Fortran modules: `greeting` and `math_utils`
+- Custom module installation directory specified as `custom_modules`
+- Shows how modules can be installed to a different location than headers
+
+## Configuration
+
+In `fpm.toml`:
+
+```toml
+[install]
+library = true
+module-dir = "custom_modules"
+```
+
+This configuration will install compiled `.mod` files to the `custom_modules` directory instead of the default `include` directory.
+
+## Testing
+
+To test this example:
+
+```bash
+cd example_packages/custom_module_dir
+fpm build
+fpm install --prefix /tmp/test_install
+# Check that .mod files are in /tmp/test_install/custom_modules/
+```

example_packages/custom_module_dir/fpm.toml

@@ -0,0 +1,3 @@
+name = "custom-module-dir"
+install.library = true
+install.module-dir = "custom_modules"

example_packages/custom_module_dir/src/greeting.f90

@@ -0,0 +1,13 @@
+module greeting
+    implicit none
+    private
+    public :: say_hello
+
+contains
+
+    subroutine say_hello(name)
+        character(len=*), intent(in) :: name
+        print *, 'Hello, ' // name // '!'
+    end subroutine say_hello
+
+end module greeting

example_packages/custom_module_dir/src/math_utils.f90

@@ -0,0 +1,20 @@
+module math_utils
+    implicit none
+    private
+    public :: add_numbers, multiply_numbers
+
+contains
+
+    function add_numbers(a, b) result(sum)
+        integer, intent(in) :: a, b
+        integer :: sum
+        sum = a + b
+    end function add_numbers
+
+    function multiply_numbers(a, b) result(product)
+        integer, intent(in) :: a, b
+        integer :: product
+        product = a * b
+    end function multiply_numbers
+
+end module math_utils

src/fpm.f90

@@ -9,7 +9,7 @@ module fpm
 use fpm_dependency, only : new_dependency_tree
 use fpm_filesystem, only: is_dir, join_path, list_files, exists, &
                    basename, filewrite, mkdir, run, os_delete_dir, delete_file
-use fpm_model, only: fpm_model_t, srcfile_t, show_model, fortran_features_t, &
+use fpm_model, only: fpm_model_t, srcfile_t, show_model, &
                     FPM_SCOPE_UNKNOWN, FPM_SCOPE_LIB, FPM_SCOPE_DEP, &
                     FPM_SCOPE_APP, FPM_SCOPE_EXAMPLE, FPM_SCOPE_TEST
 use fpm_compiler, only: new_compiler, new_archiver, set_cpp_preprocessor_flags

src/fpm/cmd/install.f90

@@ -63,7 +63,7 @@ subroutine cmd_install(settings)
 
     call new_installer(installer, prefix=settings%prefix, &
       bindir=settings%bindir, libdir=settings%libdir, testdir=settings%testdir, &
-      includedir=settings%includedir, &
+      includedir=settings%includedir, moduledir=package%install%module_dir, &
       verbosity=merge(2, 1, settings%verbose))
 
     if (allocated(package%library) .and. package%install%library) then
@@ -141,7 +141,7 @@ subroutine install_module_files(installer, targets, error)
     call filter_modules(targets, modules)
 
     do ii = 1, size(modules)
-      call installer%install_header(modules(ii)%s//".mod", error)
+      call installer%install_module(modules(ii)%s//".mod", error)
       if (allocated(error)) exit
     end do
     if (allocated(error)) return

src/fpm/installer.f90

@@ -27,6 +27,8 @@ module fpm_installer
     character(len=:), allocatable :: testdir
     !> Include directory relative to the installation prefix
     character(len=:), allocatable :: includedir
+    !> Module directory relative to the installation prefix
+    character(len=:), allocatable :: moduledir
     !> Output unit for informative printout
     integer :: unit = output_unit
     !> Verbosity of the installer
@@ -46,6 +48,8 @@ module fpm_installer
     procedure :: install_library
     !> Install a header/module in its correct subdirectory
     procedure :: install_header
+    !> Install a module in its correct subdirectory
+    procedure :: install_module
     !> Install a test program in its correct subdirectory
     procedure :: install_test
     !> Install a generic file into a subdirectory in the installation prefix
@@ -69,6 +73,9 @@ module fpm_installer
   !> Default name of the include subdirectory
   character(len=*), parameter :: default_includedir = "include"
 
+  !> Default name of the module subdirectory
+  character(len=*), parameter :: default_moduledir = "include"
+
   !> Copy command on Unix platforms
   character(len=*), parameter :: default_copy_unix = "cp"
 
@@ -90,7 +97,7 @@ module fpm_installer
 contains
 
   !> Create a new instance of an installer
-  subroutine new_installer(self, prefix, bindir, libdir, includedir, testdir, verbosity, &
+  subroutine new_installer(self, prefix, bindir, libdir, includedir, moduledir, testdir, verbosity, &
           copy, move)
     !> Instance of the installer
     type(installer_t), intent(out) :: self
@@ -102,6 +109,8 @@ subroutine new_installer(self, prefix, bindir, libdir, includedir, testdir, verb
     character(len=*), intent(in), optional :: libdir
     !> Include directory relative to the installation prefix
     character(len=*), intent(in), optional :: includedir
+    !> Module directory relative to the installation prefix
+    character(len=*), intent(in), optional :: moduledir
     !> Test directory relative to the installation prefix
     character(len=*), intent(in), optional :: testdir    
     !> Verbosity of the installer
@@ -139,6 +148,12 @@ subroutine new_installer(self, prefix, bindir, libdir, includedir, testdir, verb
     else
       self%includedir = default_includedir
     end if
+
+    if (present(moduledir)) then
+      self%moduledir = moduledir
+    else
+      self%moduledir = default_moduledir
+    end if
 
     if (present(testdir)) then 
       self%testdir = testdir
@@ -288,6 +303,18 @@ subroutine install_header(self, header, error)
     call self%install(header, self%includedir, error)
   end subroutine install_header
 
+  !> Install a module in its correct subdirectory
+  subroutine install_module(self, module, error)
+    !> Instance of the installer
+    class(installer_t), intent(inout) :: self
+    !> Path to the module
+    character(len=*), intent(in) :: module
+    !> Error handling
+    type(error_t), allocatable, intent(out) :: error
+
+    call self%install(module, self%moduledir, error)
+  end subroutine install_module
+
   !> Install a generic file into a subdirectory in the installation prefix
   subroutine install(self, source, destination, error)
     !> Instance of the installer