[adios] 100/207: Use mpic++

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:44 UTC 2015


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

mckinstry pushed a commit to branch master
in repository adios.

commit 9e912e97dfb8e104bf0905d29be8f9532b6eb9f5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 19 10:47:15 2014 +0100

    Use mpic++
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index 34f682d..d5bf138 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,10 @@ export DH_VERBOSE=1
 include /usr/share/mpi-default-dev/debian_defaults 
 ifeq ($(ARCH_DEFAULT_MPI_IMPL),lam)
   CC:=mpicc.lam
+  CXX:=mpicc.lam
 else
   CC:=mpicc
+  CXX:=mpic++
 endif
 
 ARCH:=$(shell dpkg --print-architecture)
@@ -63,6 +65,7 @@ override_dh_auto_configure:
 	echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7" >> wrappers/numpy/build/CMakeCache.txt
 	echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/x86_64-linux-gnu/python2.7" >> wrappers/numpy/build/CMakeCache.txt
 	echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython2.7.so" >> wrappers/numpy/build/CMakeCache.txt
+	echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CX)" >> wrappers/numpy/build/CMakeCache.txt
 
 override_dh_auto_build:
 	dh_auto_build

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



More information about the debian-science-commits mailing list