Skip to content

Commit 39a304d

Browse files
committed
refactor: cppc to cxx at leftout places
1 parent d8de3ce commit 39a304d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/fpm_command_line.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ subroutine get_command_line_settings(cmd_settings)
203203
character(len=*), parameter :: fc_env = "FC", cc_env = "CC", ar_env = "AR", &
204204
& fflags_env = "FFLAGS", cflags_env = "CFLAGS", ldflags_env = "LDFLAGS", &
205205
& fc_default = "gfortran", cc_default = " ", ar_default = " ", flags_default = " ", &
206-
& cppc_env = "CPPC", cppc_default = " "
206+
& cxx_env = "CXX", cxx_default = " "
207207
type(error_t), allocatable :: error
208208

209209
call set_help()
@@ -247,7 +247,7 @@ subroutine get_command_line_settings(cmd_settings)
247247
' --no-prune F' // &
248248
' --compiler "'//get_fpm_env(fc_env, fc_default)//'"' // &
249249
' --c-compiler "'//get_fpm_env(cc_env, cc_default)//'"' // &
250-
' --cpp-compiler "'//get_fpm_env(cppc_env, cppc_default)//'"' // &
250+
' --cpp-compiler "'//get_fpm_env(cxx_env, cxx_default)//'"' // &
251251
' --archiver "'//get_fpm_env(ar_env, ar_default)//'"' // &
252252
' --flag:: "'//get_fpm_env(fflags_env, flags_default)//'"' // &
253253
' --c-flag:: "'//get_fpm_env(cflags_env, flags_default)//'"' // &

src/fpm_compiler.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -793,15 +793,15 @@ end function enumerate_libraries
793793

794794

795795
!> Create new compiler instance
796-
subroutine new_compiler(self, fc, cc, cppc, echo, verbose)
796+
subroutine new_compiler(self, fc, cc, cxx, echo, verbose)
797797
!> New instance of the compiler
798798
type(compiler_t), intent(out) :: self
799799
!> Fortran compiler name or path
800800
character(len=*), intent(in) :: fc
801801
!> C compiler name or path
802802
character(len=*), intent(in) :: cc
803803
!> C++ Compiler name or path
804-
character(len=*), intent(in) :: cppc
804+
character(len=*), intent(in) :: cxx
805805
!> Echo compiler command
806806
logical, intent(in) :: echo
807807
!> Verbose mode: dump compiler output

0 commit comments

Comments
 (0)