Commit 6cf89423 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

cleanup of find_dependencies, removed PNG, removed error in...

cleanup of find_dependencies, removed PNG, removed error in extensions/preconditioner/CMakeLists.txt file
parent 75441912
...@@ -21,6 +21,7 @@ find_dependency(MuParser REQUIRED) ...@@ -21,6 +21,7 @@ find_dependency(MuParser REQUIRED)
find_dependency(nanoflann) find_dependency(nanoflann)
find_dependency(PugiXML) find_dependency(PugiXML)
# if not component is specified, assume sequential
if (NOT AMDiS_FIND_REQUIRED_SEQUENTIAL AND NOT AMDiS_FIND_REQUIRED_PARALLEL) if (NOT AMDiS_FIND_REQUIRED_SEQUENTIAL AND NOT AMDiS_FIND_REQUIRED_PARALLEL)
set (AMDiS_FIND_REQUIRED_SEQUENTIAL 1) set (AMDiS_FIND_REQUIRED_SEQUENTIAL 1)
endif () endif ()
...@@ -29,12 +30,11 @@ endif () ...@@ -29,12 +30,11 @@ endif ()
if(AMDiS_FIND_REQUIRED_SEQUENTIAL AND NOT TARGET AMDiS::AMDiS-s) if(AMDiS_FIND_REQUIRED_SEQUENTIAL AND NOT TARGET AMDiS::AMDiS-s)
find_dependency(UMFPACK ${UMFPACK_VERSION_EXACT}) find_dependency(UMFPACK ${UMFPACK_VERSION_EXACT})
find_dependency(HYPRE ${HYPRE_VERSION_EXACT}) find_dependency(HYPRE ${HYPRE_VERSION_EXACT})
#find_dependency(PNG ${PNG_VERSION_EXACT} QUIET)
find_dependency(PETSc ${PETSc_VERSION_EXACT}) find_dependency(PETSc ${PETSc_VERSION_EXACT})
find_dependency(MPI) find_dependency(MPI)
include(AMDiSTargets-s OPTIONAL RESULT_VARIABLE AMDiS_SEQUENTIAL_FOUND) include(AMDiSTargets-s OPTIONAL RESULT_VARIABLE AMDiS_SEQUENTIAL_FOUND)
if (NOT AMDiS_SEQUENTIAL_FOUND) if (NOT AMDiS_SEQUENTIAL_FOUND)
# fallback to parallel version of sequential does not exist # fallback to parallel version if sequential does not exist
set(AMDiS_FIND_REQUIRED_PARALLEL 1) set(AMDiS_FIND_REQUIRED_PARALLEL 1)
endif (NOT AMDiS_SEQUENTIAL_FOUND) endif (NOT AMDiS_SEQUENTIAL_FOUND)
endif() endif()
......
...@@ -36,14 +36,6 @@ if (HYPRE_VERSION) ...@@ -36,14 +36,6 @@ if (HYPRE_VERSION)
set(HYPRE_VERSION_EXACT "${HYPRE_VERSION}" EXACT) set(HYPRE_VERSION_EXACT "${HYPRE_VERSION}" EXACT)
endif (HYPRE_VERSION) endif (HYPRE_VERSION)
if (NOT PNG_ROOT)
file(TO_CMAKE_PATH "@PNG_INCLUDE_DIR@/.." PNG_ROOT)
endif (NOT PNG_ROOT)
set(PNG_VERSION "@PNG_VERSION@")
if (PNG_VERSION)
set(PNG_VERSION_EXACT "${PNG_VERSION}" EXACT)
endif (PNG_VERSION)
if (NOT ZLIB_ROOT) if (NOT ZLIB_ROOT)
file(TO_CMAKE_PATH "@ZLIB_INCLUDE_DIR@/.." ZLIB_ROOT) file(TO_CMAKE_PATH "@ZLIB_INCLUDE_DIR@/.." ZLIB_ROOT)
endif (NOT ZLIB_ROOT) endif (NOT ZLIB_ROOT)
......
...@@ -5,12 +5,12 @@ if (ENABLE_PARALLEL_DOMAIN) ...@@ -5,12 +5,12 @@ if (ENABLE_PARALLEL_DOMAIN)
list(APPEND AMDIS_EXTENSIONS_PRECONDITIONER_HEADERS list(APPEND AMDIS_EXTENSIONS_PRECONDITIONER_HEADERS
PetscSolverPfc.h PetscSolverPfc.h
PetscSolverPfc_diag.h PetscSolverPfc_diag.h
PetscPreconNavierStokes2.h PetscSolverNavierStokes2.h
) )
list(APPEND AMDIS_EXTENSIONS_PRECONDITIONER_SOURCES list(APPEND AMDIS_EXTENSIONS_PRECONDITIONER_SOURCES
PetscSolverPfc.cc PetscSolverPfc.cc
PetscSolverPfc_diag.cc PetscSolverPfc_diag.cc
PetscPreconNavierStokes2.cc PetscSolverNavierStokes2.cc
) )
elseif (ENABLE_SEQ_PETSC) elseif (ENABLE_SEQ_PETSC)
list(APPEND AMDIS_EXTENSIONS_PRECONDITIONER_HEADERS list(APPEND AMDIS_EXTENSIONS_PRECONDITIONER_HEADERS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment