Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hcana
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
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
jlab
hallc
analyzer_software
hcana
Commits
a5546643
Commit
a5546643
authored
4 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Plain Diff
Merge branch 'CI' into 'master'
fixing version of analyzer See merge request
!7
parents
17b4b3a3
b48d008c
No related branches found
No related tags found
1 merge request
!7
fixing version of analyzer
Pipeline
#3786
failed
4 years ago
Stage: build
Stage: build_sing_img
Stage: data_replays
Stage: data_tests
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+6
-6
6 additions, 6 deletions
CMakeLists.txt
containers/docker/Dockerfile
+1
-1
1 addition, 1 deletion
containers/docker/Dockerfile
with
7 additions
and
7 deletions
CMakeLists.txt
+
6
−
6
View file @
a5546643
...
...
@@ -36,15 +36,15 @@ if(HCANA_BUILTIN_PODD)
)
include
(
PoddCMakeEnv
)
else
()
set
(
CMAKE_MODULE_PATH
${
PROJECT_SOURCE_DIR
}
/cmake/Modules
${
CMAKE_MODULE_PATH
}
)
#
set(CMAKE_MODULE_PATH
#
${PROJECT_SOURCE_DIR}/cmake/Modules
#
${CMAKE_MODULE_PATH}
#
)
# Find Podd and register it as a dependency
# This will also automatically set up ROOT
find_package
(
Podd
2.0
REQUIRED
)
find_package
(
Podd
1.8
REQUIRED
)
include
(
PoddCMakeEnv
)
config_add_dependency
(
Podd
2.0
)
config_add_dependency
(
Podd
1.8
)
endif
()
# Register ROOT dependency - it's in our public interface
...
...
This diff is collapsed.
Click to expand it.
containers/docker/Dockerfile
+
1
−
1
View file @
a5546643
...
...
@@ -24,7 +24,7 @@ RUN ls -lrth /usr/local/lib/lib*.so \
&&
export
LD_LIBRARY_PATH
=
/usr/local/lib:
$LD_LIBRARY_PATH
\
&&
export
PATH
=
/usr/local/bin:
$PATH
\
&&
git clone https://eicweb.phy.anl.gov/jlab/hallc/analyzer_software/analyzer.git
\
&&
mkdir
analyzer/build
&&
cd
analyzer/build
&&
git pull
&&
git checkout
master
\
&&
mkdir
analyzer/build
&&
cd
analyzer/build
&&
git pull
&&
git checkout
v1.8.2
\
&&
cmake ../.
&&
make
-j20
VERBOSE
=
1
&&
make
install
\
&&
cd
/tmp
&&
rm
-rf
analyzer
...
...
This diff is collapsed.
Click to expand it.
Whitney Armstrong
@whit
mentioned in issue
#8 (closed)
·
4 years ago
mentioned in issue
#8 (closed)
mentioned in issue #8
Toggle commit list
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