IAP GITLAB
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
corsika
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue 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
Air Shower Physics
corsika
Commits
9725167f
Commit
9725167f
authored
2 years ago
by
Maximilian Reininghaus
Browse files
Options
Downloads
Plain Diff
Merge branch 'zlib_1.2.13' into 'master'
bump zlib to fix conan warning Closes
#567
See merge request
!488
parents
eada74ec
5c73250c
No related branches found
No related tags found
1 merge request
!488
bump zlib to fix conan warning
Pipeline
#10166
passed with warnings
1 year ago
Stage: quality
Stage: config
Stage: build_test_example
Stage: python
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
conan-install.sh
+2
-0
2 additions, 0 deletions
conan-install.sh
conanfile.txt
+1
-1
1 addition, 1 deletion
conanfile.txt
with
3 additions
and
1 deletion
conan-install.sh
+
2
−
0
View file @
9725167f
...
...
@@ -2,6 +2,8 @@
DIR
=
$(
readlink
-f
$(
dirname
$0
))
echo
"using
`
conan
--version
`
"
if
!
conan profile show corsika8
>
/dev/null 2>/dev/null
;
then
conan profile new
--detect
corsika8
conan profile update settings.compiler.cppstd
=
17 corsika8
...
...
This diff is collapsed.
Click to expand it.
conanfile.txt
+
1
−
1
View file @
9725167f
...
...
@@ -3,7 +3,7 @@ spdlog/1.9.2
catch2/2.13.8
eigen/3.3.8
boost/1.78.0
zlib/1.2.1
1
zlib/1.2.1
3
proposal/7.4.2
yaml-cpp/0.7.0
arrow/10.0.0
...
...
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