Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Dmitri Naumov
ogs
Commits
a1683532
Verified
Commit
a1683532
authored
3 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[cpm] Bump LibXml2 to 2.9.12 and build statically.
Will fix container runtime.
parent
906dcad6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/cmake/Dependencies.cmake
+3
-2
3 additions, 2 deletions
scripts/cmake/Dependencies.cmake
web/data/versions.json
+1
-1
1 addition, 1 deletion
web/data/versions.json
with
4 additions
and
3 deletions
scripts/cmake/Dependencies.cmake
+
3
−
2
View file @
a1683532
...
@@ -129,8 +129,8 @@ CPMFindPackage(
...
@@ -129,8 +129,8 @@ CPMFindPackage(
NAME LibXml2
NAME LibXml2
GITHUB_REPOSITORY GNOME/libxml2
GITHUB_REPOSITORY GNOME/libxml2
VERSION
${
ogs.minimum_version.libxml2
}
VERSION
${
ogs.minimum_version.libxml2
}
GIT_TAG f93ca3e140a371b26366f747a408588c631e0fd1
OPTIONS
"BUILD_SHARED_LIBS OFF"
OPTIONS
"LIBXML2_WITH_TESTS OFF"
"LIBXML2_WITH_TESTS OFF"
"LIBXML2_WITH_PROGRAMS OFF"
"LIBXML2_WITH_PROGRAMS OFF"
"LIBXML2_WITH_ICONV OFF"
"LIBXML2_WITH_ICONV OFF"
"LIBXML2_WITH_ICU OFF"
"LIBXML2_WITH_ICU OFF"
...
@@ -142,6 +142,7 @@ CPMFindPackage(
...
@@ -142,6 +142,7 @@ CPMFindPackage(
if
(
LibXml2_ADDED
)
if
(
LibXml2_ADDED
)
add_library
(
LibXml2::LibXml2 ALIAS LibXml2
)
add_library
(
LibXml2::LibXml2 ALIAS LibXml2
)
set
(
LIBXML2_INCLUDE_DIR
${
LibXml2_SOURCE_DIR
}
)
set
(
LIBXML2_INCLUDE_DIR
${
LibXml2_SOURCE_DIR
}
)
list
(
APPEND DISABLE_WARNINGS_TARGETS LibXml2
)
endif
()
endif
()
CPMAddPackage
(
CPMAddPackage
(
...
...
This diff is collapsed.
Click to expand it.
web/data/versions.json
+
1
−
1
View file @
a1683532
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
"python"
:
"3.6"
,
"python"
:
"3.6"
,
"snakemake"
:
"5.27.4"
,
"snakemake"
:
"5.27.4"
,
"hdf5"
:
"1.10.5"
,
"hdf5"
:
"1.10.5"
,
"libxml2"
:
"2.9.1
0
"
"libxml2"
:
"2.9.1
2
"
},
},
"tested_version"
:
{
"tested_version"
:
{
"ubuntu"
:
"20.04"
,
"ubuntu"
:
"20.04"
,
...
...
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