[cmake] tiny cleanup around smpi

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0099811..5dfb7d4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,12 +232,6 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
 
 ENDIF()
 
-if(ARCH_32_BITS)
-  set(MPI_ADDRESS_SIZE 4)
-else()
-  set(MPI_ADDRESS_SIZE 8)
-endif()
-
 include(CheckFunctionExists)
 include(CheckTypeSize)
 include(CheckIncludeFile)

diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in
index 84adf93..8467db5 100644 (file)
--- a/include/smpi/mpif.h.in
+++ b/include/smpi/mpif.h.in
@@ -200,8 +200,8 @@
       parameter(MPI_BXOR=11)
       
       INTEGER MPI_ADDRESS_KIND, MPI_OFFSET_KIND
-      PARAMETER (MPI_ADDRESS_KIND=@MPI_ADDRESS_SIZE@)
-      PARAMETER (MPI_OFFSET_KIND=@MPI_ADDRESS_SIZE@)
+      PARAMETER (MPI_ADDRESS_KIND=@CMAKE_SIZEOF_VOID_P@)
+      PARAMETER (MPI_OFFSET_KIND=@CMAKE_SIZEOF_VOID_P@)
 
       integer MPI_COMBINER_NAMED, MPI_COMBINER_DUP
       integer MPI_COMBINER_CONTIGUOUS, MPI_COMBINER_VECTOR

diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h.in b/teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h.in
index 5cfae7b..2f69b88 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h.in
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h.in
@@ -3,4 +3,4 @@ C
 C  (C) 2003 by Argonne National Laboratory.
 C      See COPYRIGHT in top-level directory.
 C
-      integer*@MPI_ADDRESS_SIZE@ aint, aintv(max_asizev)
+      integer*@CMAKE_SIZEOF_VOID_P@ aint, aintv(max_asizev)