[scalapack] 02/05: libscalapack-{openmpi, mpich}-dev provides scalapack cmake files

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository scalapack.

commit 9b4a079d22c0490d6ee5b7a74a60ec6b2170e732
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Aug 5 20:00:16 2017 +0800

    libscalapack-{openmpi,mpich}-dev provides scalapack cmake files
    
    scalapack-config.cmake, scalapack-config-version.cmake and
    scalapack-targets.cmake are common, but scalapack-targets-none.cmake
    is specific to the mpi version.
    
    The simplest way to handle the doubling-up is to place all of them in
    separate cmake subdirs for each libscalapack-*mpi*-dev package
    (otherwise, would need a new libscalapack-mpi-dev-common or to make
    libscalapack-mpi-dev more complex)
---
 debian/changelog                        |  1 +
 debian/libscalapack-mpich-dev.dirs      |  1 +
 debian/libscalapack-mpich-dev.install   | 10 ++++++++--
 debian/libscalapack-openmpi-dev.dirs    |  1 +
 debian/libscalapack-openmpi-dev.install | 10 ++++++++--
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28b1336..1d19e2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ scalapack (2.0.2-1exp4) UNRELEASED; urgency=medium
   * Both libscalapack-openmpi-dev and libscalapack-openmpi-dev 
     Breaks: libscalapack-mpi-dev (<< 2.0.2-1), since they now handle
     /usr/lib/<arch>/libscalapack-{openmpi,mpich}.so. Closes: #870582.
+  * libscalapack-{openmpi,mpich}-dev provides scalapack cmake files
 
  -- Drew Parsons <dparsons at debian.org>  Wed, 19 Jul 2017 18:56:59 +0800
 
diff --git a/debian/libscalapack-mpich-dev.dirs b/debian/libscalapack-mpich-dev.dirs
index 4340ddb..df4811e 100755
--- a/debian/libscalapack-mpich-dev.dirs
+++ b/debian/libscalapack-mpich-dev.dirs
@@ -1,2 +1,3 @@
 #! /bin/sh
 echo usr/lib/${DEB_HOST_MULTIARCH}
+echo usr/lib/cmake/scalapack-2.0.2.mpich
\ No newline at end of file
diff --git a/debian/libscalapack-mpich-dev.install b/debian/libscalapack-mpich-dev.install
index 78795bd..92d26ef 100755
--- a/debian/libscalapack-mpich-dev.install
+++ b/debian/libscalapack-mpich-dev.install
@@ -1,4 +1,10 @@
 #! /bin/sh
-echo usr/lib/libscalapack-mpich.so usr/lib/${DEB_HOST_MULTIARCH}
+flavour=mpich
+echo usr/lib/libscalapack-${flavour}.so usr/lib/${DEB_HOST_MULTIARCH}
 # usr/lib/pkgconfig/scalapack.pc
-# usr/lib/cmake/scalapack-2.0.2/scalapack-*.cmake
+for c in config config-version scalapack-targets; do
+  echo usr/lib/cmake/scalapack-2.0.2/scalapack-${c}.cmake usr/lib/cmake/scalapack-2.0.2.${flavour}
+done
+# scalapack-targets-none.cmake is specific to the mpi flavour, so grab from the mpi build dir
+# (see build-${flavor}/cmake_install.cmake)
+echo build-${flavour}/CMakeFiles/Export/lib/cmake/scalapack-2.0.2/scalapack-targets-none.cmake usr/lib/cmake/scalapack-2.0.2.${flavour}
diff --git a/debian/libscalapack-openmpi-dev.dirs b/debian/libscalapack-openmpi-dev.dirs
index 4340ddb..1fe743e 100755
--- a/debian/libscalapack-openmpi-dev.dirs
+++ b/debian/libscalapack-openmpi-dev.dirs
@@ -1,2 +1,3 @@
 #! /bin/sh
 echo usr/lib/${DEB_HOST_MULTIARCH}
+echo usr/lib/cmake/scalapack-2.0.2.openmpi
diff --git a/debian/libscalapack-openmpi-dev.install b/debian/libscalapack-openmpi-dev.install
index 3f08eb8..93d6acd 100755
--- a/debian/libscalapack-openmpi-dev.install
+++ b/debian/libscalapack-openmpi-dev.install
@@ -1,4 +1,10 @@
 #! /bin/sh
-echo usr/lib/libscalapack-openmpi.so usr/lib/${DEB_HOST_MULTIARCH}
+flavour=openmpi
+echo usr/lib/libscalapack-${flavour}.so usr/lib/${DEB_HOST_MULTIARCH}
 # usr/lib/pkgconfig/scalapack.pc
-# usr/lib/cmake/scalapack-2.0.2/scalapack-*.cmake
+for c in config config-version scalapack-targets; do
+  echo usr/lib/cmake/scalapack-2.0.2/scalapack-${c}.cmake usr/lib/cmake/scalapack-2.0.2.${flavour}
+done
+# scalapack-targets-none.cmake is specific to the mpi flavour, so grab from the mpi build dir
+# (see build-${flavor}/cmake_install.cmake)
+echo build-${flavour}/CMakeFiles/Export/lib/cmake/scalapack-2.0.2/scalapack-targets-none.cmake usr/lib/cmake/scalapack-2.0.2.${flavour}

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