refactor: added requested changes

Author: arteevraina

ci/run_tests.sh

@@ -127,7 +127,7 @@ pushd preprocess_hello
 popd
 
 pushd cpp_files
-"$fpm" build
+"$fpm" test
 popd
 
 # Cleanup

src/fpm.f90

@@ -43,7 +43,7 @@ subroutine build_model(model, settings, package, error)
 
     integer :: i, j
     type(package_config_t) :: dependency
-    character(len=:), allocatable :: manifest, lib_dir, flags, cflags, ldflags
+    character(len=:), allocatable :: manifest, lib_dir, flags, cflags, cxxflags, ldflags
     character(len=:), allocatable :: version
 
     logical :: duplicates_found = .false.
@@ -82,6 +82,7 @@ subroutine build_model(model, settings, package, error)
     call set_preprocessor_flags(model%compiler%id, flags, package)
 
     cflags = trim(settings%cflag)
+    cxxflags = trim(settings%cxxflag)
     ldflags = trim(settings%ldflag)
 
     if (model%compiler%is_unknown()) then
@@ -93,6 +94,7 @@ subroutine build_model(model, settings, package, error)
 
     model%fortran_compile_flags = flags
     model%c_compile_flags = cflags
+    model%cpp_compile_flags = cxxflags
     model%link_flags = ldflags
 
     model%include_tests = settings%build_tests

src/fpm_command_line.f90

@@ -79,6 +79,7 @@ module fpm_command_line
     character(len=:),allocatable :: profile
     character(len=:),allocatable :: flag
     character(len=:),allocatable :: cflag
+    character(len=:),allocatable :: cxxflag
     character(len=:),allocatable :: ldflag
 end type
 
@@ -129,7 +130,7 @@ module fpm_command_line
 &  ' ',     'fpm',    'new',     'build',  'run',    'clean',  &
 &  'test',  'runner', 'install', 'update', 'list',   'help',   'version'  ]
 
-character(len=:), allocatable :: val_runner, val_compiler, val_flag, val_cflag, val_ldflag, &
+character(len=:), allocatable :: val_runner, val_compiler, val_flag, val_cflag, val_cxxflag, val_ldflag, &
     val_profile
 
 !   '12345678901234567890123456789012345678901234567890123456789012345678901234567890',&
@@ -201,7 +202,7 @@ subroutine get_command_line_settings(cmd_settings)
             & c_compiler, cpp_compiler, archiver
 
         character(len=*), parameter :: fc_env = "FC", cc_env = "CC", ar_env = "AR", &
-            & fflags_env = "FFLAGS", cflags_env = "CFLAGS", ldflags_env = "LDFLAGS", &
+            & fflags_env = "FFLAGS", cflags_env = "CFLAGS", cxxflags_env = "CXXFLAGS", ldflags_env = "LDFLAGS", &
             & fc_default = "gfortran", cc_default = " ", ar_default = " ", flags_default = " ", &
             & cxx_env = "CXX", cxx_default = " "
         type(error_t), allocatable :: error
@@ -251,6 +252,7 @@ subroutine get_command_line_settings(cmd_settings)
           ' --archiver "'//get_fpm_env(ar_env, ar_default)//'"' // &
           ' --flag:: "'//get_fpm_env(fflags_env, flags_default)//'"' // &
           ' --c-flag:: "'//get_fpm_env(cflags_env, flags_default)//'"' // &
+          ' --cxx-flag:: "'//get_fpm_env(cxxflags_env, flags_default)//'"' // &
           ' --link-flag:: "'//get_fpm_env(ldflags_env, flags_default)//'"'
 
         ! now set subcommand-specific help text and process commandline
@@ -303,6 +305,7 @@ subroutine get_command_line_settings(cmd_settings)
             & archiver=archiver, &
             & flag=val_flag, &
             & cflag=val_cflag, &
+            & cxxflag=val_cxxflag, &
             & ldflag=val_ldflag, &
             & example=lget('example'), &
             & list=lget('list'),&
@@ -332,6 +335,7 @@ subroutine get_command_line_settings(cmd_settings)
             & archiver=archiver, &
             & flag=val_flag, &
             & cflag=val_cflag, &
+            & cxxflag=val_cxxflag, &
             & ldflag=val_ldflag, &
             & list=lget('list'),&
             & show_model=lget('show-model'),&
@@ -487,6 +491,7 @@ subroutine get_command_line_settings(cmd_settings)
                 archiver=archiver, &
                 flag=val_flag, &
                 cflag=val_cflag, &
+                cxxflag=val_cxxflag, &
                 ldflag=val_ldflag, &
                 no_rebuild=lget('no-rebuild'), &
                 verbose=lget('verbose'))
@@ -543,6 +548,7 @@ subroutine get_command_line_settings(cmd_settings)
             & archiver=archiver, &
             & flag=val_flag, &
             & cflag=val_cflag, &
+            & cxxflag=val_cxxflag, &
             & ldflag=val_ldflag, &
             & example=.false., &
             & list=lget('list'), &
@@ -623,6 +629,7 @@ subroutine check_build_vals()
 
         val_flag = " " // sget('flag')
         val_cflag = " " // sget('c-flag')
+        val_cxxflag = " "// sget('cxx-flag')
         val_ldflag = " " // sget('link-flag')
         val_profile = sget('profile')
 

src/fpm_compiler.f90

@@ -816,6 +816,11 @@ subroutine new_compiler(self, fc, cc, cxx, echo, verbose)
       self%cc = cc
     else
       call get_default_c_compiler(self%fc, self%cc)
+    end if
+
+    if (len_trim(cxx) > 0) then
+      self%cxx = cxx
+    else
       call get_default_cpp_compiler(self%fc, self%cxx)
     end if
 end subroutine new_compiler

src/fpm_model.f90

@@ -155,6 +155,9 @@ module fpm_model
     !> Command line flags passed to C for compilation
     character(:), allocatable :: c_compile_flags
 
+    !> Command line flags passed to C++ for compilation
+    character(:), allocatable :: cpp_compile_flags
+
     !> Command line flags passed to the linker
     character(:), allocatable :: link_flags
 
@@ -319,6 +322,7 @@ function info_model(model) result(s)
     !    character(:), allocatable :: fortran_compile_flags
     s = s // ', fortran_compile_flags="' // model%fortran_compile_flags // '"'
     s = s // ', c_compile_flags="' // model%c_compile_flags // '"'
+    s = s // ', cpp_compile_flags="' // model%cpp_compile_flags // '"'
     s = s // ', link_flags="' // model%link_flags // '"'
     s = s // ', build_prefix="' // model%build_prefix // '"'
     !    type(string_t), allocatable :: link_libraries(:)

src/fpm_sources.f90

@@ -85,7 +85,7 @@ subroutine add_sources_from_dir(sources,directory,scope,with_executables,recurse
     is_source = [(.not.(is_hidden_file(basename(file_names(i)%s))) .and. &
                  .not.(canon_path(file_names(i)%s) .in. existing_src_files) .and. &
                  (str_ends_with(lower(file_names(i)%s), fortran_suffixes) .or. &
-                 str_ends_with(lower(file_names(i)%s),[".c  ",".h  ", ".cpp"]) ),i=1,size(file_names))]
+                 str_ends_with(lower(file_names(i)%s), c_suffixes) ),i=1,size(file_names))]
     src_file_names = pack(file_names,is_source)
 
     allocate(dir_sources(size(src_file_names)))

src/fpm_targets.f90

@@ -243,13 +243,20 @@ subroutine build_target_list(targets,model)
                 case (FPM_UNIT_CPPSOURCE) 
 
                     call add_target(targets,package=model%packages(j)%name,source = sources(i), &
-                                type = FPM_UNIT_CPPSOURCE, &
+                                type = FPM_TARGET_CPP_OBJECT, &
                                 output_name = get_object_name(sources(i)), &
                                 macros = model%packages(j)%macros, &
                                 version = model%packages(j)%version)
 
-                    !> Add stdc++ as a linker flag.
-                    model%link_flags = model%link_flags // "stdc++"
+                    if (with_lib .and. sources(i)%unit_scope == FPM_SCOPE_LIB) then
+                        ! Archive depends on object
+                        call add_dependency(targets(1)%ptr, targets(size(targets))%ptr)
+                    end if
+
+                    !> Add stdc++ as a linker flag. If not already there.
+                    if (.not. ("stdc++" .in. model%link_libraries)) then
+                        model%link_libraries = [model%link_libraries, string_t("stdc++")]
+                    end if
 
                 case (FPM_UNIT_PROGRAM)
 
@@ -725,10 +732,12 @@ subroutine resolve_target_linking(targets, model)
     do i=1,size(targets)
 
         associate(target => targets(i)%ptr)
-            if (target%target_type /= FPM_TARGET_C_OBJECT) then
+            if (target%target_type /= FPM_TARGET_C_OBJECT .and. target%target_type /= FPM_TARGET_CPP_OBJECT) then
                 target%compile_flags = model%fortran_compile_flags
-            else
+            else if (target%target_type == FPM_TARGET_C_OBJECT) then
                 target%compile_flags = model%c_compile_flags
+            else if(target%target_type == FPM_TARGET_CPP_OBJECT) then
+                target%compile_flags = model%cpp_compile_flags
             end if
 
             !> Get macros as flags.