Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
70d4fda1
Commit
70d4fda1
authored
10 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
when PETSC_DIR/SLEPC_DIR are used, don't look for the libs in standard locations - fixes
#263
parent
a015a8c5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+6
-4
6 additions, 4 deletions
CMakeLists.txt
with
6 additions
and
4 deletions
CMakeLists.txt
+
6
−
4
View file @
70d4fda1
...
@@ -985,7 +985,8 @@ if(HAVE_SOLVER)
...
@@ -985,7 +985,8 @@ if(HAVE_SOLVER)
${
ENV_PETSC_DIR
}
/
${
ENV_PETSC_ARCH
}
/lib
""
)
${
ENV_PETSC_DIR
}
/
${
ENV_PETSC_ARCH
}
/lib
""
)
# petsc 3.1 creates only one library (libpetsc)
# petsc 3.1 creates only one library (libpetsc)
if
(
NOT PETSC_LIBS
)
if
(
NOT PETSC_LIBS
)
find_library
(
PETSC_LIBS petsc PATHS
${
ENV_PETSC_DIR
}
/
${
ENV_PETSC_ARCH
}
/lib
)
find_library
(
PETSC_LIBS petsc PATHS
${
ENV_PETSC_DIR
}
/
${
ENV_PETSC_ARCH
}
/lib
NO_DEFAULT_PATH
)
endif
(
NOT PETSC_LIBS
)
endif
(
NOT PETSC_LIBS
)
if
(
PETSC_LIBS
)
if
(
PETSC_LIBS
)
set_config_option
(
HAVE_PETSC
"PETSc"
)
set_config_option
(
HAVE_PETSC
"PETSc"
)
...
@@ -1003,17 +1004,18 @@ if(HAVE_SOLVER)
...
@@ -1003,17 +1004,18 @@ if(HAVE_SOLVER)
else
(
SLEPC_DIR
)
else
(
SLEPC_DIR
)
set
(
ENV_SLEPC_DIR $ENV{SLEPC_DIR}
)
set
(
ENV_SLEPC_DIR $ENV{SLEPC_DIR}
)
endif
(
SLEPC_DIR
)
endif
(
SLEPC_DIR
)
find_library
(
SLEPC_LIB slepc PATHS
${
ENV_SLEPC_DIR
}
/
${
ENV_PETSC_ARCH
}
/lib
)
find_library
(
SLEPC_LIB slepc PATHS
${
ENV_SLEPC_DIR
}
/
${
ENV_PETSC_ARCH
}
/lib
NO_DEFAULT_PATH
)
if
(
SLEPC_LIB
)
if
(
SLEPC_LIB
)
find_path
(
SLEPC_INC
"slepc.h"
PATHS
${
ENV_SLEPC_DIR
}
PATH_SUFFIXES include
find_path
(
SLEPC_INC
"slepc.h"
PATHS
${
ENV_SLEPC_DIR
}
PATH_SUFFIXES include
${
ENV_PETSC_ARCH
}
/include include/slepc
)
${
ENV_PETSC_ARCH
}
/include include/slepc
NO_DEFAULT_PATH
)
if
(
SLEPC_INC
)
if
(
SLEPC_INC
)
message
(
STATUS
"Using SLEPc dir:
${
ENV_SLEPC_DIR
}
"
)
message
(
STATUS
"Using SLEPc dir:
${
ENV_SLEPC_DIR
}
"
)
set_config_option
(
HAVE_SLEPC
"SLEPc"
)
set_config_option
(
HAVE_SLEPC
"SLEPc"
)
list
(
APPEND EXTERNAL_LIBRARIES
${
SLEPC_LIB
}
)
list
(
APPEND EXTERNAL_LIBRARIES
${
SLEPC_LIB
}
)
list
(
APPEND EXTERNAL_INCLUDES
${
SLEPC_INC
}
)
list
(
APPEND EXTERNAL_INCLUDES
${
SLEPC_INC
}
)
find_path
(
SLEPC_INC2
"slepcconf.h"
PATHS
${
ENV_SLEPC_DIR
}
find_path
(
SLEPC_INC2
"slepcconf.h"
PATHS
${
ENV_SLEPC_DIR
}
PATH_SUFFIXES
${
ENV_PETSC_ARCH
}
/include
)
PATH_SUFFIXES
${
ENV_PETSC_ARCH
}
/include
NO_DEFAULT_PATH
)
if
(
SLEPC_INC2
)
if
(
SLEPC_INC2
)
list
(
APPEND EXTERNAL_INCLUDES
${
SLEPC_INC2
}
)
list
(
APPEND EXTERNAL_INCLUDES
${
SLEPC_INC2
}
)
endif
(
SLEPC_INC2
)
endif
(
SLEPC_INC2
)
...
...
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