Skip to content

Commit a3cadcc

Browse files
Copilotklendathu2k
andcommitted
Fix F90 include path handling in Conscript-standard
Added F90PATH variable extraction and synchronization with FCPATH. Fortran 90 files now have proper include paths set for finding .inc files. - Extract F90, F90FLAGS, F90PATH, F90COM from environment - Set F90PATH wherever FCPATH is modified - Pass F90 variables to cloned environment for package builds Co-authored-by: klendathu2k <56083924+klendathu2k@users.noreply.github.com>
1 parent e5a7555 commit a3cadcc

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

mgr/Conscript-standard

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ my $FCPATH = $env1->{FCPATH};
8585
my $FEXTEND = $env1->{FEXTEND};
8686
my $FPPFLAGS= $env1->{FPPFLAGS};
8787
my $FCCOM = $env1->{FCCOM};
88+
my $F90 = $env1->{F90};
89+
my $F90FLAGS= $env1->{F90FLAGS};
90+
my $F90PATH = $env1->{F90PATH};
91+
my $F90COM = $env1->{F90COM};
8892
my $LIBS = $env1->{LIBS};
8993
my $SOFLAGS = $env1->{SOFLAGS};
9094
my $LIBPATH = $env1->{LIBPATH};
@@ -600,6 +604,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
600604
my $py8ver = "Pythia8_1_86";
601605

602606
$FCPATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/$pkg";
607+
$F90PATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/$pkg";
603608
$CPPPATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/$pkg";
604609
$CPPPATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/HepMC2_06_09";
605610
$CPPPATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/${py8ver}/include";
@@ -671,6 +676,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
671676
$CPPPATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/HepMC2_06_09";
672677
$CPPPATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/Tauola1_1_5/include/Tauola";
673678
$FCPATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/$pkg/tauola-fortran/tauola-modified/new-currents/RChL-currents/rcht_3pi";
679+
$F90PATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/$pkg/tauola-fortran/tauola-modified/new-currents/RChL-currents/rcht_3pi";
674680
#$CPPPATH .= $main::PATH_SEPARATOR . "#StRoot/StarGenerator/$pkg/tauola-fortran/tauola-modified/new-currents/RChL-currents/rcht_3pi";
675681
$CXXFLAGS .= " -DTauola_version=\\\"$pkg\\\" ";
676682
$CPPFLAGS .= " -x c++";
@@ -776,6 +782,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
776782
$main::PATH_SEPARATOR . "#" . $Dir . "/../starsim/include" .
777783
$main::PATH_SEPARATOR . "#" . $Dir . "/../gcalor/include" .
778784
$main::PATH_SEPARATOR . $env1->{FCPATH};
785+
$F90PATH = $FCPATH;
779786
$FPPFLAGS = " -DATLAS_UNIX -DCOMMONS_CONFIG_H -DCERNLIB_LINUX -DCPP_VERS=\"'W'\"";
780787
# $FPPFLAGS = $env1->{Packages}->{CERNLIB}->{FPPFLAGS} . " -DCOMMONS_CONFIG_H -DCERNLIB_LINUX -DCPP_VERS=\"'W'\"";
781788
# $CPPFLAGS .= " " . $env1->{Packages}->{CERNLIB}->{CPPFLAGS};
@@ -786,6 +793,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
786793
$FCPATH .= $main::PATH_SEPARATOR . "#asps/Simulation/starsim/include";
787794
$FCPATH .= $main::PATH_SEPARATOR . "#asps/Simulation/geant321/include";
788795
$FCPATH .= $main::PATH_SEPARATOR . $env1->{ENV}->{CERN_ROOT} . "/include";
796+
$F90PATH = $FCPATH;
789797
# $FCPATH .= $main::PATH_SEPARATOR . $env1->{Packages}->{CERNLIB}->{INCDIR};
790798

791799
} elsif ( $pkg =~ /^xgeometry/ ){
@@ -799,6 +807,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
799807
$FPPFLAGS .= " " . $env1->{Packages}->{CERNLIB}->{FPPFLAGS};
800808
$CPPFLAGS .= " " . $env1->{Packages}->{CERNLIB}->{CPPFLAGS};
801809
$FCPATH = "#StarVMC/minicern" . $main::PATH_SEPARATOR . $INCLUDE;
810+
$F90PATH = $FCPATH;
802811
$CPPPATH .= $main::PATH_SEPARATOR . "#StarVMC/minicern";
803812
my @srcC = ();
804813
foreach my $s (@src) {
@@ -828,6 +837,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
828837
$CPPFLAGS .= " " . $env1->{Packages}->{CERNLIB}->{CPPFLAGS};
829838
$FCPATH = "#StarVMC/geant3" . $main::PATH_SEPARATOR . "#StarVMC/geant3/minicern" . $main::PATH_SEPARATOR . $INCLUDE .
830839
$main::PATH_SEPARATOR . $env1->{Packages}->{CERNLIB}->{INCDIR};
840+
$F90PATH = $FCPATH;
831841
$CPPPATH .= $main::PATH_SEPARATOR . $env1->{Packages}->{CERNLIB}->{INCDIR};
832842
my @dirs = qw (added gbase gcons geocad ggeom gheisha ghits ghrout ghutils
833843
giface giopa gkine gparal gphys gscan gstrag gtrak matx55 miface
@@ -990,6 +1000,10 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
9901000
'FPPFLAGS' => $FPPFLAGS,
9911001
'CPPFLAGS' => $CPPFLAGS,
9921002
'FCCOM' => $FCCOM,
1003+
'F90' => $F90,
1004+
'F90FLAGS' => $F90FLAGS,
1005+
'F90PATH' => $F90PATH,
1006+
'F90COM' => $F90COM,
9931007
'LIBS' => $LIBS,
9941008
'SOFLAGS' => $SOFLAGS,
9951009
'LIBPATH' => $libpath,

0 commit comments

Comments
 (0)