Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Pawian
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PWA
Pawian
Commits
dd663e7a
Commit
dd663e7a
authored
10 years ago
by
kopf
Browse files
Options
Downloads
Patches
Plain Diff
minor changes for himster
parent
47a317e1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
AppUtils/AppBase.cc
+1
-1
1 addition, 1 deletion
AppUtils/AppBase.cc
Jamroot
+8
-1
8 additions, 1 deletion
Jamroot
SetEnv_kph
+4
-2
4 additions, 2 deletions
SetEnv_kph
with
13 additions
and
4 deletions
AppUtils/AppBase.cc
+
1
−
1
View file @
dd663e7a
...
...
@@ -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
));
...
...
This diff is collapsed.
Click to expand it.
Jamroot
+
8
−
1
View file @
dd663e7a
...
...
@@ -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 ;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
SetEnv_kph
+
4
−
2
View file @
dd663e7a
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment