avoid the use of libmpi++ 55/18555/2
Cedric Delamarre [Fri, 23 Sep 2016 12:40:51 +0000 (14:40 +0200)]
Change-Id: Icd9f6a05923f5c8c3c832d1030981eaef8051c27

scilab/modules/mpi/Makefile.am
scilab/modules/mpi/Makefile.in
scilab/modules/mpi/includes/sciMpiComm.hxx

index 9ece3c3..cb1d3d0 100644 (file)
@@ -56,7 +56,7 @@ libscimpi_la_CPPFLAGS=  -Iincludes/ \
     $(OPENMPI_CFLAGS)
 
 # libscimpi_la_LDFLAGS = $(LAMPI_LDFLAGS)
-libscimpi_la_LIBADD = $(OPENMPI_LIBS) -lmpi++
+libscimpi_la_LIBADD = $(OPENMPI_LIBS)
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
@@ -85,6 +85,7 @@ libscimpi_la_sci_gateway_DATA = sci_gateway/mpi_gateway.xml
 ####┬ámpi : include files ####
 libscimpi_la_includedir=$(pkgincludedir)/mpi
 libscimpi_la_include_HEADERS = includes/gw_mpi.h \
+                               includes/dynlib_mpi.h \
                                includes/sciMpiComm.hxx
 
 # Provides macros compilation, Java compilation, cleaning
index 6f48f32..80707c7 100644 (file)
@@ -629,7 +629,7 @@ libscimpi_la_CPPFLAGS = -Iincludes/ \
 
 
 # libscimpi_la_LDFLAGS = $(LAMPI_LDFLAGS)
-libscimpi_la_LIBADD = $(OPENMPI_LIBS) -lmpi++
+libscimpi_la_LIBADD = $(OPENMPI_LIBS)
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
index 46fb93e..a8ffbf3 100644 (file)
 #ifndef __SCIMPICOMM_HXX__
 #define __SCIMPICOMM_HXX__
 
+// avoid c++ openmpi include
+#define OMPI_SKIP_MPICXX
+
 #include <string>
 #include <mpi.h>
 #include "user.hxx"
 
 extern "C"
 {
-    #include "dynlib_mpi.h"
+#include "dynlib_mpi.h"
 }
 
 class MPI_IMPEXP SciMpiComm : public types::UserType