Merge branch 'PETSc-3.17.1' into 'development'
PETSc 3.17.1 adjustments See merge request damask/DAMASK!571
This commit is contained in:
commit
2792153ca2
|
@ -2,7 +2,7 @@ name: Grid and Mesh Solver
|
||||||
on: [push]
|
on: [push]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
PETSC_VERSION: '3.17.0'
|
PETSC_VERSION: '3.17.1'
|
||||||
HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker
|
HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker
|
||||||
HOMEBREW_NO_AUTO_UPDATE: 'ON'
|
HOMEBREW_NO_AUTO_UPDATE: 'ON'
|
||||||
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON'
|
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON'
|
||||||
|
|
|
@ -41,7 +41,7 @@ message("\nBuilding ${CMAKE_PROJECT_NAME} ${DAMASK_VERSION}\n")
|
||||||
add_definitions(-DPETSC)
|
add_definitions(-DPETSC)
|
||||||
add_definitions(-DDAMASKVERSION="${DAMASK_VERSION}")
|
add_definitions(-DDAMASKVERSION="${DAMASK_VERSION}")
|
||||||
add_definitions(-DCMAKE_SYSTEM="${CMAKE_SYSTEM}")
|
add_definitions(-DCMAKE_SYSTEM="${CMAKE_SYSTEM}")
|
||||||
if(PETSC_VERSION VERSION_GREATER_EQUAL 3.17.0)
|
if(PETSC_VERSION VERSION_EQUAL 3.17.0)
|
||||||
add_definitions("-DCHKERRQ=PetscCall")
|
add_definitions("-DCHKERRQ=PetscCall")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue