Skip to content
Snippets Groups Projects
Commit dd663e7a authored by kopf's avatar kopf
Browse files

minor changes for himster

parent 47a317e1
No related branches found
No related tags found
No related merge requests found
......@@ -563,7 +563,7 @@ void AppBase::loopChannelEnvFactory(int argcWCfgFile, char** argvWCfgFile, std::
argvWCfgFile[1]=(char*)"-c";
argvWCfgFile[2]=(char*)(*it).c_str();
for (int i=0; i<argcWCfgFile ; ++i) Info << argvWCfgFile[i] << endmsg;
std::shared_ptr<AbsChannelEnv> channelEnv=0;
std::shared_ptr<AbsChannelEnv> channelEnv;
if(channelType==AbsChannelEnv::CHANNEL_PBARP){
pbarpParser* currentParser = new pbarpParser(argcWCfgFile, argvWCfgFile);
channelEnv = std::shared_ptr<AbsChannelEnv>(new PbarpChannelEnv(currentParser));
......
......@@ -12,10 +12,17 @@ rule split-stack-cond ( properties * )
local gcc-ver = [ MATCH <toolset-gcc:version>(.*) : $(properties) ] ;
local major = [ MATCH (.)\..* : $(gcc-ver) ] ;
local minor = [ MATCH .\.(.).* : $(gcc-ver) ] ;
if $(major) > 4 | ( $(major) = 4 & $(minor) >= 7 )
# ECHO "gcc-ver: $(gcc-ver)" ;
# ECHO "major: $(major)" ;
# ECHO "minor: $(minor)" ;
if ( $(major) > 4 | ( $(major) = 4 & $(minor) >= 7 ) )
{
return <cxxflags>-ftemplate-depth=256 ;
}
if ( $(major) = 4 & $(minor) = 4 )
{
return <cxxflags>-ftemplate-depth-256 ;
}
}
}
......
setenv ROOTSYS /cluster/bes3/lcg/external/ROOT/5.24.00b/x86_64-slc5-gcc43-opt/root
#setenv ROOTSYS /cluster/bes3/lcg/external/ROOT/5.24.00b/x86_64-slc5-gcc43-opt/root
#setenv ROOTSYS /cluster/scratch/root
#setenv ROOTSYS /cluster/bes3/external/ROOT/5.34.09/x86_64-slc6-gcc46-opt/root
setenv ROOTSYS /data/work/kphpbb/kopf/PWA/rootInstall
setenv TOP_DIR `pwd | sed -e 's/\/nfs//'`
setenv LD_LIBRARY_PATH ${ROOTSYS}/lib:${TOP_DIR}/lib:/data/work/kphpbb/kopf/PWA/lib:/data/work/kphpbb/kopf/PWA/localSys/lib
setenv PATH ${PATH}:${ROOTSYS}/bin:/data/work/kphpbb/kopf/PWA/bin:/data/work/kphpbb/kopf/PWA/localSys/bin
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment