[getdp] 59/60: fix PETS/SPLEC when splitted into several libs

[Matteo F. Vescovi]

This is an automated email from the git hooks/post-receive script.

mfv pushed a commit to branch master
in repository getdp.

commit 880b88f249e7520ff86174a9c1b9d18b653f2bab
Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Date:   Sat Oct 10 16:48:15 2015 +0000

    fix PETS/SPLEC when splitted into several libs
---
 debian/patches/petsc.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/petsc.patch b/debian/patches/petsc.patch
new file mode 100644
index 0000000..6330a54
--- /dev/null
+++ b/debian/patches/petsc.patch
@@ -0,0 +1,56 @@
+Index: getdp-2.6.2~svn4257/CMakeLists.txt
+===================================================================
+--- getdp-2.6.2~svn4257.orig/CMakeLists.txt
++++ getdp-2.6.2~svn4257/CMakeLists.txt
+@@ -382,13 +382,15 @@ if(ENABLE_PETSC)
+       endif(PETSC_PACKAGES_INCLUDES)
+     endif(PETSC_PACKAGES_INCLUDES)
+     # find libraries (<= 3.0)
+-    set(PETSC_LIBS_REQUIRED petscksp petscdm petscmat petscvec petsc)
++    set(PETSC_LIBS_REQUIRED petscksp petscdm petscmat petscvec petscsys petscsnes)
+     find_all_libraries(PETSC_LIBS PETSC_LIBS_REQUIRED
+                        ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib "")
++    message(STATUS "Using PETSC_LIBS : ${PETSC_LIBS}")
+     # petsc 3.1 creates only one library (libpetsc)
+     if(NOT PETSC_LIBS)
+       find_library(PETSC_LIBS petsc PATHS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib
+                    NO_DEFAULT_PATH)
++      message(STATUS "Using PETSC_LIB : ${PETSC_LIBS}")
+     endif(NOT PETSC_LIBS)
+     if(PETSC_LIBS)
+       set_config_option(HAVE_PETSC "PETSc")
+@@ -406,15 +408,22 @@ if(ENABLE_PETSC)
+       else(SLEPC_DIR)
+         set(ENV_SLEPC_DIR $ENV{SLEPC_DIR})
+       endif(SLEPC_DIR)
+-      find_library(SLEPC_LIB slepc PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib
++      set(SLEPC_LIBS_REQUIRED slepcsys slepcmfn slepceps slepcsvd slepcpep slepcnep)
++      find_all_libraries(SLEPC_LIBS SLEPC_LIBS_REQUIRED
++                       ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib "")
++      message(STATUS "Using SLEPC_LIBS : ${SLEPC_LIBS}")
++      if(NOT SLEPC_LIBS)
++        find_library(SLEPC_LIBS slepc PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib
+                    NO_DEFAULT_PATH)
+-      if(SLEPC_LIB)
++        message(STATUS "Using SLEPC_LIB : ${SLEPC_LIBS}")
++      endif(NOT SLEPC_LIBS)
++      if(SLEPC_LIBS)
+         find_path(SLEPC_INC "slepc.h" PATHS ${ENV_SLEPC_DIR} PATH_SUFFIXES include
+                   ${ENV_PETSC_ARCH}/include include/slepc NO_DEFAULT_PATH)
+         if(SLEPC_INC)
+           message(STATUS "Using SLEPc dir: ${ENV_SLEPC_DIR}")
+           set_config_option(HAVE_SLEPC "SLEPc")
+-          list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB})
++          list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIBS})
+           list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
+           find_path(SLEPC_INC2 "slepcconf.h" PATHS ${ENV_SLEPC_DIR}
+                     PATH_SUFFIXES ${ENV_PETSC_ARCH}/include NO_DEFAULT_PATH)
+@@ -422,7 +431,7 @@ if(ENABLE_PETSC)
+             list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
+           endif(SLEPC_INC2)
+         endif(SLEPC_INC)
+-      endif(SLEPC_LIB)
++      endif(SLEPC_LIBS)
+     endif(ENABLE_SLEPC)
+     list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
+     # find additional libraries to link with
diff --git a/debian/patches/series b/debian/patches/series
index 2429376..506b08e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 ##fix_latest_svn.patch
 #cmake.patch
 cmake.patch
+petsc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getdp.git