Get rid of the shadow file for mpi.h.in on Windows.

This commit was SVN r22154.

contrib/Makefile.am

@@ -98,7 +98,6 @@ EXTRA_DIST = \
         platform/win32/CMakeModules/ompi_get_version.cmake \
         platform/win32/CMakeModules/opal_functions.cmake \
         platform/win32/CMakeModules/setup_f77.cmake \
-        platform/win32/ConfigFiles/mpi.h.cmake \
         platform/win32/ConfigFiles/opal_config.h.cmake \
         platform/win32/ConfigFiles/revision.in \
 	platform/cisco/macosx-dynamic \

contrib/platform/win32/CMakeModules/ompi_configure.cmake

@@ -145,6 +145,8 @@ ENDIF(BUILD_SHARED_LIBS)
 IF(WIN32 AND MSVC)
   SET(COMPILER_FAMILYNAME MICROSOFT)
   SET(COMPILER_VERSION ${MSVC_VERSION})
+  SET(OPAL_BUILD_PLATFORM_COMPILER_FAMILYID 14)
+  SET(OPAL_BUILD_PLATFORM_COMPILER_VERSION ${MSVC_VERSION})
 ENDIF(WIN32 AND MSVC)
 
 
@@ -1653,8 +1655,7 @@ SET(OPAL_HAVE_WEAK_SYMBOLS 0)
 #/* Type of MPI_Offset -- has to be defined here and typedef'ed later because
 #   mpi.h does not get AC SUBST's */
 #/* #undef OMPI_MPI_OFFSET_TYPE */
-SET (OMPI_MPI_OFFSET_TYPE 1)
+SET (OMPI_MPI_OFFSET_TYPE "long long")
-SET (OMPI_MPI_OFFSET_TYPE_STRING "long long")
 #
 #/* Version of the MX API to use */
 #/* #undef OMPI_MX_API_VERSION */

contrib/platform/win32/CMakeModules/ompi_get_version.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
@@ -100,9 +100,7 @@ SET(OPAL_MAJOR_VERSION_STRING ${MAJOR_VERSION})
 SET(OPAL_MINOR_VERSION_STRING ${MINOR_VERSION})
 SET(OPAL_RELEASE_VERSION_STRING ${RELEASE_VERSION})
 SET(OPAL_VERSION_STRING ${VERSION_STRING})
-
+SET(OPAL_IDENT_STRING ${VERSION_STRING})
-SET(OPAL_IDENT_STRING 1)
-SET(OPAL_IDENT_STRING_VALUE ${VERSION_STRING})
 
 # Set OMPI versions
 

contrib/platform/win32/ConfigFiles/opal_config.h.cmake

@@ -59,6 +59,8 @@
 
 #define ORTE_RELEASE_DATE ${RELEASE_DATE}
 
+#define OPAL_BUILD_PLATFORM_COMPILER_FAMILYID ${OPAL_BUILD_PLATFORM_COMPILER_FAMILYID}
+
 #define OPAL_BUILD_PLATFORM_COMPILER_FAMILYNAME ${COMPILER_FAMILYNAME}
 
 #define OPAL_BUILD_PLATFORM_COMPILER_VERSION_STR ${COMPILER_VERSION}
@@ -1163,7 +1165,7 @@
 
 /* Type of MPI_Offset -- has to be defined here and typedef'ed later because
    mpi.h does not get AC SUBST's */
-#cmakedefine OMPI_MPI_OFFSET_TYPE ${OMPI_MPI_OFFSET_TYPE_STRING}
+#cmakedefine OMPI_MPI_OFFSET_TYPE ${OMPI_MPI_OFFSET_TYPE}
 
 /* Version of the MX API to use */
 #cmakedefine OMPI_MX_API_VERSION
@@ -1320,7 +1322,7 @@
 #cmakedefine OPAL_HAVE__SC_NPROCESSORS_ONLN
 
 /* ident string for Open MPI */
-#cmakedefine OPAL_IDENT_STRING "${OPAL_IDENT_STRING_VALUE}"
+#cmakedefine OPAL_IDENT_STRING "${OPAL_IDENT_STRING}"
 
 /* Major release number of Open Portable Access Layer */
 #cmakedefine OPAL_MAJOR_VERSION ${OPAL_MAJOR_VERSION_STRING}

opal/include/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007-2008 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2007-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2008      The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
@@ -18,8 +18,22 @@ IF(HAVE_LONG_LONG)
   SET(OPAL_HAVE_LONG_LONG 1)
 ENDIF(HAVE_LONG_LONG)
 
-# generate mpi.h and mpif.h
+
-CONFIGURE_FILE(${OpenMPI_SOURCE_DIR}/contrib/platform/win32/ConfigFiles/mpi.h.cmake ${OpenMPI_BINARY_DIR}/ompi/include/mpi.h)
+
+# make a temporary copy of the input file
+FILE(READ ${OpenMPI_SOURCE_DIR}/ompi/include/mpi.h.in MPI_H_IN)
+
+# change the syntax of the copy into CMake understandable
+STRING(REGEX REPLACE "#undef ([-_a-zA-Z0-9]+)[ ]*\n" "#cmakedefine \\1 \${\\1}\n" MPI_H_OUT "${MPI_H_IN}")
+STRING(REPLACE "{OMPI_MAJOR_VERSION}" "{OMPI_MAJOR_VERSION_STRING}" MPI_H_OUT "${MPI_H_OUT}")
+STRING(REPLACE "{OMPI_MINOR_VERSION}" "{OMPI_MINOR_VERSION_STRING}" MPI_H_OUT "${MPI_H_OUT}")
+STRING(REPLACE "{OMPI_RELEASE_VERSION}" "{OMPI_RELEASE_VERSION_STRING}" MPI_H_OUT "${MPI_H_OUT}")
+STRING(REPLACE "#cmakedefine OMPI_HAVE_FORTRAN_" "#define OMPI_HAVE_FORTRAN_"  MPI_H_OUT "${MPI_H_OUT}")
+
+FILE(WRITE ${CMAKE_FILES_DIRECTORY}/CMakeTmp/mpi.h.in "${MPI_H_OUT}")
+
+# generate mpi.h
+CONFIGURE_FILE(${CMAKE_FILES_DIRECTORY}/CMakeTmp/mpi.h.in ${OpenMPI_BINARY_DIR}/ompi/include/mpi.h)
 
 IF(OMPI_WANT_F77_BINDINGS)
   CONFIGURE_FILE(${OpenMPI_SOURCE_DIR}/ompi/include/mpif.h.in ${OpenMPI_BINARY_DIR}/ompi/include/mpif.h)