Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs-feliks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Feliks Kiszkurno
ogs-feliks
Commits
6d2087b4
Verified
Commit
6d2087b4
authored
4 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
Replaced json-cmake submodule with CPM.
parent
9bb8d4c2
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitmodules
+0
-3
0 additions, 3 deletions
.gitmodules
ThirdParty/json-cmake
+0
-1
0 additions, 1 deletion
ThirdParty/json-cmake
scripts/cmake/SubmoduleSetup.cmake
+0
-1
0 additions, 1 deletion
scripts/cmake/SubmoduleSetup.cmake
scripts/cmake/Versions.cmake
+7
-1
7 additions, 1 deletion
scripts/cmake/Versions.cmake
with
7 additions
and
6 deletions
.gitmodules
+
0
−
3
View file @
6d2087b4
...
...
@@ -19,9 +19,6 @@
[submodule "ThirdParty/ogs6py"]
path = ThirdParty/ogs6py
url = https://github.com/joergbuchwald/ogs6py.git
[submodule "ThirdParty/json-cmake"]
path = ThirdParty/json-cmake
url = https://github.com/ufz/json-cmake.git
[submodule "ThirdParty/xdmf"]
path = ThirdParty/xdmf
url = https://gitlab.opengeosys.org/ogs/xdmflib.git
This diff is collapsed.
Click to expand it.
json-cmake
@
9708cb09
Compare
9708cb09
...
9708cb09
Subproject commit 9708cb091f6b89b94d71ae98f8b9e68ea04c47dd
This diff is collapsed.
Click to expand it.
scripts/cmake/SubmoduleSetup.cmake
+
0
−
1
View file @
6d2087b4
...
...
@@ -5,7 +5,6 @@ endif()
# This file initializes the required submodules
set
(
REQUIRED_SUBMODULES
ThirdParty/iphreeqc/src
ThirdParty/json-cmake
)
if
(
OGS_USE_XDMF
)
list
(
APPEND REQUIRED_SUBMODULES ThirdParty/xdmf
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Versions.cmake
+
7
−
1
View file @
6d2087b4
include
(
${
PROJECT_SOURCE_DIR
}
/ThirdParty/json-cmake/JSONParser.cmake
)
CPMAddPackage
(
NAME json-cmake
GITHUB_REPOSITORY ufz/json-cmake
GIT_TAG 9708cb091f6b89b94d71ae98f8b9e68ea04c47dd
DOWNLOAD_ONLY YES
)
include
(
"
${
json-cmake_SOURCE_DIR
}
/JSONParser.cmake"
)
file
(
READ
${
PROJECT_SOURCE_DIR
}
/web/data/versions.json jsonFileString
)
sbeParseJson
(
ogs jsonFileString
)
# Provides variables, e.g. ogs.minimum_version.gcc
...
...
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