Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
athena
Manage
Activity
Members
Labels
Plan
Issues
38
Issue boards
Milestones
Wiki
Code
Merge requests
34
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
EIC
detectors
athena
Commits
7a39ae0a
Commit
7a39ae0a
authored
3 years ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
CMakeLists.txt: set_diagnostic_flags (-Werror)
parent
b8213add
No related branches found
No related tags found
2 merge requests
!329
Master into deathvalley
,
!321
CMakeLists.txt: set_diagnostic_flags (-Werror)
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-5
3 additions, 5 deletions
CMakeLists.txt
src/FileLoader.cpp
+3
-3
3 additions, 3 deletions
src/FileLoader.cpp
with
6 additions
and
8 deletions
CMakeLists.txt
+
3
−
5
View file @
7a39ae0a
...
@@ -10,13 +10,11 @@ PROJECT(athena
...
@@ -10,13 +10,11 @@ PROJECT(athena
)
)
set
(
CMAKE_CXX_STANDARD 17
)
set
(
CMAKE_CXX_STANDARD 17
)
find_package
(
DD4hep REQUIRED COMPONENTS DDCore DDG4
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Werror"
)
find_package
(
DD4hep REQUIRED COMPONENTS DDCore DDG4
)
find_package
(
Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep
)
find_package
(
Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep
)
find_package
(
fmt REQUIRED
)
find_package
(
fmt
)
#find_library(FMT_LIBRARY fmt)
#-----------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------
set
(
a_lib_name athena
)
set
(
a_lib_name athena
)
...
...
This diff is collapsed.
Click to expand it.
src/FileLoader.cpp
+
3
−
3
View file @
7a39ae0a
...
@@ -68,9 +68,9 @@ long load_file(
...
@@ -68,9 +68,9 @@ long load_file(
"_"
,
"_"
,
pos
+
1
);
pos
+
1
);
if
(
after
==
std
::
string
::
npos
)
after
=
cache
.
size
();
// cache ends on env var
if
(
after
==
std
::
string
::
npos
)
after
=
cache
.
size
();
// cache ends on env var
auto
env_name
=
cache
.
substr
(
pos
+
1
,
after
-
pos
-
1
);
const
std
::
string
env_name
(
cache
.
substr
(
pos
+
1
,
after
-
pos
-
1
)
)
;
auto
env_
value
=
std
::
getenv
(
env_name
.
c_str
());
auto
env_
ptr
=
std
::
getenv
(
env_name
.
c_str
());
if
(
env_value
=
=
nullptr
)
env_
value
=
""
;
const
std
::
string
env_value
(
env_ptr
!
=
nullptr
?
env_
ptr
:
""
)
;
cache
.
erase
(
pos
,
after
-
pos
);
cache
.
erase
(
pos
,
after
-
pos
);
cache
.
insert
(
pos
,
env_value
);
cache
.
insert
(
pos
,
env_value
);
printout
(
INFO
,
"FileLoader"
,
"$"
+
env_name
+
" -> "
+
env_value
);
printout
(
INFO
,
"FileLoader"
,
"$"
+
env_name
+
" -> "
+
env_value
);
...
...
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