Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
iwr
amdis
Commits
73772d03
Commit
73772d03
authored
Oct 18, 2016
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
petsc, mpi, parmetis and metis configuration updated
parent
941d28f2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
AMDiS/cmake3/AMDISConfig.cmake.in
AMDiS/cmake3/AMDISConfig.cmake.in
+1
-1
AMDiS/cmake3/CMakeLists.txt
AMDiS/cmake3/CMakeLists.txt
+3
-3
AMDiS/cmake3/target_enable_petsc.cmake
AMDiS/cmake3/target_enable_petsc.cmake
+7
-5
No files found.
AMDiS/cmake3/AMDISConfig.cmake.in
View file @
73772d03
...
...
@@ -101,7 +101,7 @@ if (AMDIS_HAS_PARALLEL_DOMAIN)
HAVE_PARALLEL_DOMAIN_AMDIS=1)
include(target_enable_petsc)
target_enable_mpi(amdis_base INTERFACE)
target_enable_mpi(amdis_base INTERFACE
ON
)
target_enable_petsc(amdis_base INTERFACE ON)
endif (AMDIS_HAS_PARALLEL_DOMAIN)
...
...
AMDiS/cmake3/CMakeLists.txt
View file @
73772d03
...
...
@@ -222,9 +222,9 @@ endif (ENABLE_COMPOSITE_FEM)
# ------------------------------------------------------------------------------
if
(
MSVC
)
target_compile_definitions
(
amdis PRIVATE
_SCL_SECURE_NO_WARNINGS
_CRT_SECURE_NO_WARNINGS
)
target_compile_definitions
(
amdis PRIVATE
_SCL_SECURE_NO_WARNINGS
_CRT_SECURE_NO_WARNINGS
)
endif
(
MSVC
)
target_link_libraries
(
amdis AMDiS::base muparser
...
...
AMDiS/cmake3/target_enable_petsc.cmake
View file @
73772d03
...
...
@@ -27,7 +27,7 @@ macro(target_enable_petsc _TARGET_ _SCOPE_)
endif
()
# PETSc library is required
find_package
(
pets
c QUIET
)
find_package
(
PETS
c QUIET
)
if
(
PETSc_FOUND
)
set
(
PETSC_INCLUDE_DIRS
${
PETSC_INCLUDES
}
)
set
(
PETSC_LIBRARY_DIRS
${
PETSC_LIB_DIR
}
)
...
...
@@ -64,7 +64,7 @@ macro(target_enable_petsc _TARGET_ _SCOPE_)
# parmetis is required
find_file
(
PARMETIS_HEADER_FILE
"parmetis.h"
HINTS
${
PARMETIS_DIR
}
/include
${
PETSC_INCLUDE_DIRS
}
)
HINTS
${
PARMETIS_DIR
}
/include
${
PETSC_INCLUDE_DIRS
}
/usr/include/parmetis
)
if
(
PARMETIS_HEADER_FILE
)
get_filename_component
(
PARMETIS_INCLUDE_PATH
"
${
PARMETIS_HEADER_FILE
}
"
PATH CACHE
)
target_include_directories
(
${
_TARGET_
}
${
_SCOPE_
}
${
PARMETIS_INCLUDE_PATH
}
)
...
...
@@ -78,13 +78,14 @@ macro(target_enable_petsc _TARGET_ _SCOPE_)
if
(
NOT PARMETIS_LIB
)
message
(
FATAL_ERROR
"Could not find the ParMetis libraries needed by amdis"
)
endif
(
NOT PARMETIS_LIB
)
message
(
STATUS
" Found ParMetis library
${
PARMETIS_LIB
}
"
)
target_link_libraries
(
${
_TARGET_
}
${
_SCOPE_
}
${
PARMETIS_LIB
}
)
endif
(
LINK_EXECUTABLE
)
# metis is required
find_file
(
METIS_HEADER_FILE
"metis.h"
HINTS
${
METIS_DIR
}
/include
${
P
ARMETIS_DIR
}
/include
${
PETSC_INCLUDE_DIRS
}
)
HINTS
${
METIS_DIR
}
/include
${
P
ETSC_INCLUDE_DIRS
}
/usr/include/metis
)
if
(
METIS_HEADER_FILE
)
get_filename_component
(
METIS_INCLUDE_PATH
"
${
METIS_HEADER_FILE
}
"
PATH CACHE
)
target_include_directories
(
${
_TARGET_
}
${
_SCOPE_
}
${
METIS_INCLUDE_PATH
}
)
...
...
@@ -94,10 +95,11 @@ macro(target_enable_petsc _TARGET_ _SCOPE_)
if
(
LINK_EXECUTABLE
)
find_library
(
METIS_LIB metis
HINTS
${
METIS_DIR
}
/lib
${
PARMETIS_DIR
}
/lib
${
PETSC_LIBRARY_DIRS
}
)
HINTS
${
METIS_DIR
}
/lib
${
PETSC_LIBRARY_DIRS
}
)
if
(
NOT METIS_LIB
)
message
(
FATAL_ERROR
"Could not find the M
E
tis libraries needed by amdis"
)
message
(
FATAL_ERROR
"Could not find the M
e
tis libraries needed by amdis"
)
endif
(
NOT METIS_LIB
)
message
(
STATUS
" Found Metis library
${
METIS_LIB
}
"
)
target_link_libraries
(
${
_TARGET_
}
${
_SCOPE_
}
${
METIS_LIB
}
)
endif
(
LINK_EXECUTABLE
)
...
...
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