fix: set cxx compiler in fpm_<xxx>_settings and also renamed cpp to cxx at left out places

Author: arteevraina

src/fpm.f90

@@ -94,7 +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%cxx_compile_flags = cxxflags
     model%link_flags = ldflags
 
     model%include_tests = settings%build_tests
@@ -219,8 +219,10 @@ subroutine build_model(model, settings, package, error)
         write(*,*)'<INFO> BUILD_NAME: ',model%build_prefix
         write(*,*)'<INFO> COMPILER:  ',model%compiler%fc
         write(*,*)'<INFO> C COMPILER:  ',model%compiler%cc
+        write(*,*)'<INFO> CXX COMPILER: ',model%compiler%cxx
         write(*,*)'<INFO> COMPILER OPTIONS:  ', model%fortran_compile_flags
         write(*,*)'<INFO> C COMPILER OPTIONS:  ', model%c_compile_flags
+        write(*,*)'<INFO> CXX COMPILER OPTIONS: ', model%cxx_compile_flags
         write(*,*)'<INFO> LINKER OPTIONS:  ', model%link_flags
         write(*,*)'<INFO> INCLUDE DIRECTORIES:  [', string_cat(model%include_dirs,','),']'
      end if

src/fpm_command_line.f90

@@ -302,6 +302,7 @@ subroutine get_command_line_settings(cmd_settings)
             & prune=.not.lget('no-prune'), &
             & compiler=val_compiler, &
             & c_compiler=c_compiler, &
+            & cxx_compiler=cxx_compiler, &
             & archiver=archiver, &
             & flag=val_flag, &
             & cflag=val_cflag, &
@@ -332,6 +333,7 @@ subroutine get_command_line_settings(cmd_settings)
             & prune=.not.lget('no-prune'), &
             & compiler=val_compiler, &
             & c_compiler=c_compiler, &
+            & cxx_compiler=cxx_compiler, &
             & archiver=archiver, &
             & flag=val_flag, &
             & cflag=val_cflag, &
@@ -488,6 +490,7 @@ subroutine get_command_line_settings(cmd_settings)
                 prune=.not.lget('no-prune'), &
                 compiler=val_compiler, &
                 c_compiler=c_compiler, &
+                cxx_compiler=cxx_compiler, &
                 archiver=archiver, &
                 flag=val_flag, &
                 cflag=val_cflag, &
@@ -545,6 +548,7 @@ subroutine get_command_line_settings(cmd_settings)
             & prune=.not.lget('no-prune'), &
             & compiler=val_compiler, &
             & c_compiler=c_compiler, &
+            & cxx_compiler=cxx_compiler, &
             & archiver=archiver, &
             & flag=val_flag, &
             & cflag=val_cflag, &

src/fpm_model.f90

@@ -156,7 +156,7 @@ module fpm_model
     character(:), allocatable :: c_compile_flags
 
     !> Command line flags passed to C++ for compilation
-    character(:), allocatable :: cpp_compile_flags
+    character(:), allocatable :: cxx_compile_flags
 
     !> Command line flags passed to the linker
     character(:), allocatable :: link_flags
@@ -322,7 +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 // ', cxx_compile_flags="' // model%cxx_compile_flags // '"'
     s = s // ', link_flags="' // model%link_flags // '"'
     s = s // ', build_prefix="' // model%build_prefix // '"'
     !    type(string_t), allocatable :: link_libraries(:)

src/fpm_targets.f90

@@ -743,7 +743,7 @@ subroutine resolve_target_linking(targets, model)
             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
+                target%compile_flags = model%cxx_compile_flags
             end if
 
             !> Get macros as flags.