From 35e30f108115bd9ec6e70067beb74807ec8293c9 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 24 Oct 2015 22:50:53 +0200 Subject: [PATCH] [cmake] tiny cleanup around smpi --- CMakeLists.txt | 6 ------ include/smpi/mpif.h.in | 4 ++-- teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h.in | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00998112c5..5dfb7d491c 100644 --- 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 84adf9356e..8467db52bd 100644 --- 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 5cfae7b30f..2f69b88051 100644 --- 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) -- 2.20.1