Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Kirill Terekhov
INMOST
Commits
28d2d393
Unverified
Commit
28d2d393
authored
Jan 24, 2021
by
Kirill Terekhov
Committed by
GitHub
Jan 24, 2021
Browse files
Merge pull request #41 from INMOST-DEV/petsc-fix
fix for newer PETSc versions compare
parents
64babb1b
f4525bf7
Changes
1
Show whitespace changes
Inline
Side-by-side
cmake_find/FindPETSc.cmake
View file @
28d2d393
...
@@ -26,6 +26,7 @@ set(PETSC_VALID_COMPONENTS
...
@@ -26,6 +26,7 @@ set(PETSC_VALID_COMPONENTS
C
C
CXX
)
CXX
)
if
(
NOT PETSc_FIND_COMPONENTS
)
if
(
NOT PETSc_FIND_COMPONENTS
)
set
(
PETSC_LANGUAGE_BINDINGS
"C"
)
set
(
PETSC_LANGUAGE_BINDINGS
"C"
)
else
()
else
()
...
@@ -269,6 +270,7 @@ show :
...
@@ -269,6 +270,7 @@ show :
set
(
_PETSC_TEST_SOURCE
"
set
(
_PETSC_TEST_SOURCE
"
static const char help[] =
\"
PETSc test program.
\"
;
static const char help[] =
\"
PETSc test program.
\"
;
#include <petscts.h>
#include <petscts.h>
#include <petscsys.h>
int main(int argc,char *argv[]) {
int main(int argc,char *argv[]) {
PetscErrorCode ierr;
PetscErrorCode ierr;
TS ts;
TS ts;
...
@@ -292,7 +294,11 @@ int main(int argc,char *argv[]) {
...
@@ -292,7 +294,11 @@ int main(int argc,char *argv[]) {
find_path
(
PETSC_INCLUDE_DIR petscts.h HINTS
"
${
PETSC_DIR
}
"
PATH_SUFFIXES include NO_DEFAULT_PATH
)
find_path
(
PETSC_INCLUDE_DIR petscts.h HINTS
"
${
PETSC_DIR
}
"
PATH_SUFFIXES include NO_DEFAULT_PATH
)
find_path
(
PETSC_INCLUDE_CONF petscconf.h HINTS
"
${
PETSC_DIR
}
"
PATH_SUFFIXES
"
${
PETSC_ARCH
}
/include"
"bmake/
${
PETSC_ARCH
}
"
NO_DEFAULT_PATH
)
find_path
(
PETSC_INCLUDE_CONF petscconf.h HINTS
"
${
PETSC_DIR
}
"
PATH_SUFFIXES
"
${
PETSC_ARCH
}
/include"
"bmake/
${
PETSC_ARCH
}
"
NO_DEFAULT_PATH
)
mark_as_advanced
(
PETSC_INCLUDE_DIR PETSC_INCLUDE_CONF
)
mark_as_advanced
(
PETSC_INCLUDE_DIR PETSC_INCLUDE_CONF
)
if
(
USE_MPI
)
set
(
petsc_includes_minimal
${
PETSC_INCLUDE_CONF
}
${
PETSC_INCLUDE_DIR
}
${
MPI_INCLUDE_PATH
}
)
else
()
set
(
petsc_includes_minimal
${
PETSC_INCLUDE_CONF
}
${
PETSC_INCLUDE_DIR
}
)
set
(
petsc_includes_minimal
${
PETSC_INCLUDE_CONF
}
${
PETSC_INCLUDE_DIR
}
)
endif
()
#message(STATUS "petsc_includes_minimal")
#message(STATUS "petsc_includes_minimal")
#foreach(D ${petsc_includes_minimal})
#foreach(D ${petsc_includes_minimal})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment