refactor: rename cpp_compiler to cxx_compiler

Author: arteevraina

src/fpm.f90

@@ -65,7 +65,7 @@ subroutine build_model(model, settings, package, error)
     end if
 
     call new_compiler(model%compiler, settings%compiler, settings%c_compiler, &
-        & settings%cpp_compiler, echo=settings%verbose, verbose=settings%verbose)
+        & settings%cxx_compiler, echo=settings%verbose, verbose=settings%verbose)
     call new_archiver(model%archiver, settings%archiver, &
         & echo=settings%verbose, verbose=settings%verbose)
 

src/fpm_command_line.f90

@@ -74,7 +74,7 @@ module fpm_command_line
     logical                      :: prune=.true.
     character(len=:),allocatable :: compiler
     character(len=:),allocatable :: c_compiler
-    character(len=:),allocatable :: cpp_compiler
+    character(len=:),allocatable :: cxx_compiler
     character(len=:),allocatable :: archiver
     character(len=:),allocatable :: profile
     character(len=:),allocatable :: flag
@@ -199,7 +199,7 @@ subroutine get_command_line_settings(cmd_settings)
         logical                       :: unix
         type(fpm_install_settings), allocatable :: install_settings
         character(len=:), allocatable :: common_args, compiler_args, run_args, working_dir, &
-            & c_compiler, cpp_compiler, archiver
+            & c_compiler, cxx_compiler, archiver
 
         character(len=*), parameter :: fc_env = "FC", cc_env = "CC", ar_env = "AR", &
             & fflags_env = "FFLAGS", cflags_env = "CFLAGS", cxxflags_env = "CXXFLAGS", ldflags_env = "LDFLAGS", &
@@ -248,7 +248,7 @@ subroutine get_command_line_settings(cmd_settings)
           ' --no-prune F' // &
           ' --compiler "'//get_fpm_env(fc_env, fc_default)//'"' // &
           ' --c-compiler "'//get_fpm_env(cc_env, cc_default)//'"' // &
-          ' --cpp-compiler "'//get_fpm_env(cxx_env, cxx_default)//'"' // &
+          ' --cxx-compiler "'//get_fpm_env(cxx_env, cxx_default)//'"' // &
           ' --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)//'"' // &
@@ -291,7 +291,7 @@ subroutine get_command_line_settings(cmd_settings)
             enddo
 
             c_compiler = sget('c-compiler')
-            cpp_compiler = sget('cpp-compiler')
+            cxx_compiler = sget('cxx-compiler')
             archiver = sget('archiver')
             allocate(fpm_run_settings :: cmd_settings)
             val_runner=sget('runner')
@@ -324,7 +324,7 @@ subroutine get_command_line_settings(cmd_settings)
             call check_build_vals()
 
             c_compiler = sget('c-compiler')
-            cpp_compiler = sget('cpp-compiler')
+            cxx_compiler = sget('cxx-compiler')
             archiver = sget('archiver')
             allocate( fpm_build_settings :: cmd_settings )
             cmd_settings=fpm_build_settings(  &
@@ -479,7 +479,7 @@ subroutine get_command_line_settings(cmd_settings)
             call check_build_vals()
 
             c_compiler = sget('c-compiler')
-            cpp_compiler = sget('cpp-compiler')
+            cxx_compiler = sget('cxx-compiler')
             archiver = sget('archiver')
             allocate(install_settings)
             install_settings = fpm_install_settings(&
@@ -534,7 +534,7 @@ subroutine get_command_line_settings(cmd_settings)
             enddo
 
             c_compiler = sget('c-compiler')
-            cpp_compiler = sget('cpp-compiler')
+            cxx_compiler = sget('cxx-compiler')
             archiver = sget('archiver')
             allocate(fpm_test_settings :: cmd_settings)
             val_runner=sget('runner')

src/fpm_compiler.f90

@@ -588,39 +588,39 @@ subroutine get_default_c_compiler(f_compiler, c_compiler)
 end subroutine get_default_c_compiler
 
 !> Get C++ Compiler.
-subroutine get_default_cpp_compiler(f_compiler, cpp_compiler)
+subroutine get_default_cxx_compiler(f_compiler, cxx_compiler)
     character(len=*), intent(in) :: f_compiler
-    character(len=:), allocatable, intent(out) :: cpp_compiler
+    character(len=:), allocatable, intent(out) :: cxx_compiler
     integer(compiler_enum) :: id
 
     id = get_compiler_id(f_compiler)
 
     select case(id)
 
     case(id_intel_classic_nix, id_intel_classic_mac, id_intel_classic_windows)
-        cpp_compiler = 'icpc'
+        cxx_compiler = 'icpc'
 
     case(id_intel_llvm_nix,id_intel_llvm_windows)
-        cpp_compiler = 'icpx'
+        cxx_compiler = 'icpx'
 
     case(id_flang, id_flang_new, id_f18)
-        cpp_compiler='clang'
+        cxx_compiler='clang'
 
     case(id_ibmxl)
-        cpp_compiler='xlc++'
+        cxx_compiler='xlc++'
 
     case(id_lfortran)
-        cpp_compiler = 'cc'
+        cxx_compiler = 'cc'
 
     case(id_gcc)
-        cpp_compiler = 'g++'
+        cxx_compiler = 'g++'
 
     case default
         ! Fall-back to using Fortran compiler
-        cpp_compiler = f_compiler
+        cxx_compiler = f_compiler
     end select
 
-end subroutine get_default_cpp_compiler
+end subroutine get_default_cxx_compiler
 
 
 function get_compiler_id(compiler) result(id)
@@ -821,7 +821,7 @@ subroutine new_compiler(self, fc, cc, cxx, echo, verbose)
     if (len_trim(cxx) > 0) then
       self%cxx = cxx
     else
-      call get_default_cpp_compiler(self%fc, self%cxx)
+      call get_default_cxx_compiler(self%fc, self%cxx)
     end if
 end subroutine new_compiler