Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Backofen, Rainer
amdis
Commits
b1bd6c98
Commit
b1bd6c98
authored
Jan 18, 2011
by
Naumann, Andreas
Browse files
extended petsc support with cmake and wrong library path with parmetis
parent
f9a324f2
Changes
3
Hide whitespace changes
Inline
Side-by-side
AMDiS/AMDiSConfig.cmake.in
View file @
b1bd6c98
...
...
@@ -89,9 +89,10 @@ if(${AMDiS_FIND_COMPONENTS} MATCHES umfpack )
endif()
if( AMDiS_NEED_PARMETIS )
list(APPEND AMDiS_LIBRARY_DIRS ${AMDiS_LIBRARY_DIR}/parmetis)
list(APPEND AMDiS_LIBRARIES parmetis metis)
endif()
if(${AMDiS_FIND_COMPONENTS} MATCHES parmetis AND NOT
${
AMDiS_NEED_PARMETIS
}
)
if(${AMDiS_FIND_COMPONENTS} MATCHES parmetis AND NOT AMDiS_NEED_PARMETIS)
message(SEND_ERROR "amdis was not compiled with parmetis")
endif()
AMDiS/AMDiSUse.cmake
View file @
b1bd6c98
#load mpi-compiler for use with parmetis and parallel_domain
if
(
${
AMDiS_HAS_PARALLEL_DOMAIN
}
)
if
(
NOT
${
AMDiS_NEED_PARMETIS
}
)
if
(
AMDiS_HAS_PARALLEL_DOMAIN
)
if
(
NOT AMDiS_NEED_PARMETIS
)
message
(
SEND_ERROR
"parallel domain needs parmetis, but AMDiS was not compiled with parmetis support. There's something really odd.."
)
else
()
find_package
(
MPI REQUIRED
)
...
...
@@ -9,13 +9,14 @@ if(${AMDiS_HAS_PARALLEL_DOMAIN})
CMAKE_FORCE_CXX_COMPILER
(
mpicxx
"The MPI C++ compiler"
)
CMAKE_FORCE_C_COMPILER
(
mpicc
"The MPI C Compiler"
)
endif
(
MPI_FOUND
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
AMDiS_DIR
}
)
find_package
(
PETSc REQUIRED
)
if
(
PETSC_FOUND
)
list
(
APPEND AMDiS_LIBRARIES
${
PETSC_LIBRARIES
}
)
list
(
APPEND AMDiS_INCLUDE_DIRS
${
PETSC_INCLUDES
}
)
endif
(
PETS
c
_FOUND
)
endif
(
NOT
${
AMDiS_NEED_PARMETIS
}
)
endif
(
${
AMDiS_HAS_PARALLEL_DOMAIN
}
)
endif
(
PETS
C
_FOUND
)
endif
(
NOT AMDiS_NEED_PARMETIS
)
endif
(
AMDiS_HAS_PARALLEL_DOMAIN
)
#thats bad because it affects each target
add_definitions
(
${
AMDiS_COMPILEFLAGS
}
)
link_directories
(
${
AMDiS_LIBRARY_DIRS
}
)
...
...
AMDiS/CMakeLists.txt
View file @
b1bd6c98
...
...
@@ -167,7 +167,7 @@ if(ENABLE_PARALLEL_DOMAIN)
INSTALL
(
FILES
${
LIB_DIR
}
/ParMetis-3.1/parmetis.h
${
LIB_DIR
}
/ParMetis-3.1/libparmetis.a
${
LIB_DIR
}
/ParMetis-3.1/libmetis.a
DESTINATION lib/parmetis
DESTINATION lib/
amdis/
parmetis
)
set
(
ENABLE_PARMETIS ON
)
set
(
CMAKE_MODULE_PATH
"
${
CMAKE_MODULE_PATH
}
;/usr/share/cmake-2.8/Modules/;
${
CMAKE_SOURCE_DIR
}
/"
)
...
...
@@ -184,6 +184,8 @@ if(ENABLE_PARALLEL_DOMAIN)
${
SOURCE_DIR
}
/parallel/ParallelProblemStatBase.cc
${
SOURCE_DIR
}
/parallel/PetscSolver.cc
)
SET
(
COMPILEFLAGS
"
${
COMPILEFLAGS
}
-DHAVE_PARALLEL_DOMAIN_AMDIS=1"
)
INSTALL
(
FILES ResolveCompilerPaths.cmake FindPackageMultipass.cmake FindPETSc.cmake
DESTINATION share/amdis/
)
endif
(
ENABLE_PARALLEL_DOMAIN
)
if
(
ENABLE_OPENMP
)
...
...
@@ -312,6 +314,7 @@ configure_file(${AMDiS_SOURCE_DIR}/AMDiSConfig.cmake.in
${
AMDiS_BINARY_DIR
}
/AMDiSConfig.cmake
@ONLY
)
INSTALL
(
FILES
${
AMDiS_BINARY_DIR
}
/AMDiSConfig.cmake
DESTINATION share/amdis/
)
list
(
APPEND deb_add_dirs
"share/amdis/"
)
...
...
Write
Preview
Supports
Markdown
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