fixes fortran-lang#1008

henilp105 · Jun 23, 2024 · 47d411a · 47d411a
1 parent 06cdf47
commit 47d411a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/fpm_command_line.f90 b/src/fpm_command_line.f90
@@ -143,6 +143,7 @@ module fpm_command_line
 character(len=:),allocatable :: os_type
 character(len=ibug),allocatable :: names(:)
 character(len=:),allocatable :: tnames(:)
+logical :: conda=.false.
 
 character(len=:), allocatable :: version_text(:)
 character(len=:), allocatable :: help_new(:), help_fpm(:), help_run(:), &
@@ -290,6 +291,7 @@ subroutine get_command_line_settings(cmd_settings)
         compiler_args = &
           ' --profile " "' // &
           ' --no-prune F' // &
+          ' --conda F' // &
           ' --compiler "'//get_fpm_env(fc_env, fc_default)//'"' // &
           ' --c-compiler "'//get_fpm_env(cc_env, cc_default)//'"' // &
           ' --cxx-compiler "'//get_fpm_env(cxx_env, cxx_default)//'"' // &
@@ -541,6 +543,7 @@ subroutine get_command_line_settings(cmd_settings)
             c_compiler = sget('c-compiler')
             cxx_compiler = sget('cxx-compiler')
             archiver = sget('archiver')
+            ! conda = lget('conda')
             allocate(install_settings, source=fpm_install_settings(&
                 list=lget('list'), &
                 profile=val_profile,&
@@ -779,6 +782,8 @@ subroutine check_build_vals()
         if(val_compiler=='') val_compiler='gfortran'
 
         val_flag = " " // sget('flag')
+        conda = lget('conda')
+        if (conda) val_flag = val_flag// ' -I$CONDA_PREFIX/include -L$CONDA_PREFIX/lib -Wl,-rpath -Wl,$CONDA_PREFIX/lib'
         val_cflag = " " // sget('c-flag')
         val_cxxflag = " "// sget('cxx-flag')
         val_ldflag = " " // sget('link-flag')