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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wenqing
ogs
Commits
a7b740cb
Commit
a7b740cb
authored
Feb 6, 2019
by
Lars Bilke
Committed by
Dmitri Naumov
Feb 6, 2019
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] Added option OGS_USE_CVODE.
parent
6d94d62e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+1
-0
1 addition, 0 deletions
CMakeLists.txt
Jenkinsfile
+2
-1
2 additions, 1 deletion
Jenkinsfile
scripts/cmake/ConanSetup.cmake
+4
-0
4 additions, 0 deletions
scripts/cmake/ConanSetup.cmake
scripts/cmake/Find.cmake
+3
-3
3 additions, 3 deletions
scripts/cmake/Find.cmake
with
10 additions
and
4 deletions
CMakeLists.txt
+
1
−
0
View file @
a7b740cb
...
...
@@ -48,6 +48,7 @@ set(OGS_CONAN_BUILD "missing" CACHE STRING "Possible values: all, missing, \
if
(
OGS_USE_PETSC
)
set
(
OGS_USE_MPI ON CACHE BOOL
"Use MPI"
FORCE
)
endif
()
option
(
OGS_USE_CVODE
"Use the Sundials CVODE module?"
OFF
)
### CMake includes ###
include
(
PreFind
)
...
...
This diff is collapsed.
Click to expand it.
Jenkinsfile
+
2
−
1
View file @
a7b740cb
...
...
@@ -92,7 +92,8 @@ pipeline {
cmakeOptions
=
'-DOGS_CPU_ARCHITECTURE=generic '
+
'-DOGS_USE_PYTHON=ON '
+
'-DOGS_BUILD_UTILS=ON '
'-DOGS_BUILD_UTILS=ON '
+
'-DOGS_USE_CVODE=ON '
}
build
{
target
=
"package"
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/ConanSetup.cmake
+
4
−
0
View file @
a7b740cb
...
...
@@ -66,6 +66,10 @@ if(OGS_USE_LIS)
set
(
CONAN_REQUIRES
${
CONAN_REQUIRES
}
lis/1.7.9@bilke/stable
)
endif
()
if
(
OGS_USE_CVODE
)
set
(
CONAN_REQUIRES
${
CONAN_REQUIRES
}
cvode/2.8.2@bilke/stable
)
endif
()
if
(
OGS_BUILD_GUI
)
set
(
CONAN_REQUIRES
${
CONAN_REQUIRES
}
Shapelib/1.3.0@bilke/stable
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Find.cmake
+
3
−
3
View file @
a7b740cb
...
...
@@ -158,10 +158,10 @@ elseif(OGS_BUILD_GUI)
endif
()
## Sundials cvode ode-solver library
find_package
(
CVODE
)
if
(
CVODE_FOUN
D
)
if
(
OGS_USE_
CVODE
)
find_package
(
CVODE REQUIRE
D
)
add_definitions
(
-DCVODE_FOUND
)
endif
()
# CVODE_FOUND
endif
()
if
(
OGS_USE_MFRONT
)
find_package
(
MGIS REQUIRED
)
...
...
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