Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hcana
Manage
Activity
Members
Labels
Plan
Issues
6
Issue boards
Milestones
Wiki
Code
Merge requests
1
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
b20f6072
Commit
b20f6072
authored
4 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Plain Diff
Merge branch 'CI' into 'master'
Ci See merge request
!2
parents
d9eaafa4
962b4b7f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2
Ci
Pipeline
#3775
failed with stages
in 2 minutes and 16 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
with
2 additions
and
2 deletions
CMakeLists.txt
+
2
−
2
View file @
b20f6072
cmake_minimum_required
(
VERSION 3.5
)
project
(
hcana VERSION 1.3.
0
LANGUAGES CXX
)
project
(
hcana VERSION 1.3.
1
LANGUAGES CXX
)
option
(
HCANA_BUILTIN_PODD
"Use built-in Podd submodule (default: YES)"
OFF
)
...
...
@@ -38,7 +38,7 @@ if(HCANA_BUILTIN_PODD)
else
()
# Find Podd and register it as a dependency
# This will also automatically set up ROOT
find_package
(
Podd
1.6
REQUIRED
)
find_package
(
Podd
2.0
REQUIRED
)
include
(
PoddCMakeEnv
)
config_add_dependency
(
Podd 1.6
)
endif
()
...
...
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