From a987eafc900b8070916d68659a2eef7875abd0ba Mon Sep 17 00:00:00 2001 From: Shiqing Fan Date: Tue, 24 Aug 2010 09:28:56 +0000 Subject: [PATCH] Add another sm definition for ignoring posix sm on Windows, and exclude those source files. This commit was SVN r23640. --- .../platform/win32/CMakeModules/ompi_check_Microsoft.cmake | 4 +++- ompi/mca/common/sm/.windows | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake b/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake index 06169e8a2e..d332f76aa4 100644 --- a/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake +++ b/contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake @@ -178,8 +178,10 @@ OMPI_DEF_VAR(HAVE_INTERLOCKEDCOMPAREEXCHANGE64 "Whether we support 64 bits atomi OMPI_DEF_VAR(HAVE_INTERLOCKEDCOMPAREEXCHANGEACQUIRE "Whether we support 32 bits atomic operations on Windows" 0 0) OMPI_DEF_VAR(HAVE_INTERLOCKEDCOMPAREEXCHANGERELEASE "Whether we support 32 bits atomic operations on Windows" 0 0) +# a few definitions for shared memory support OMPI_DEF(MCA_COMMON_SM_WINDOWS 1 "Whether we have shared memory support for Windows or not." 0 1) -OMPI_DEF(MCA_COMMON_SM_SYSV 0 "Whether we have shared memory support for Windows or not." 0 1) +OMPI_DEF(MCA_COMMON_SM_SYSV 0 "Whether we have shared memory support for SYSV or not." 0 1) +OMPI_DEF(MCA_COMMON_SM_POSIX 0 "Whether we have shared memory support for POSIX or not." 0 1) OMPI_CHECK_INCLUDE_FILE (windows.h HAVE_WINDOWS_H) diff --git a/ompi/mca/common/sm/.windows b/ompi/mca/common/sm/.windows index 470d7d7a06..78e0bcc194 100644 --- a/ompi/mca/common/sm/.windows +++ b/ompi/mca/common/sm/.windows @@ -9,4 +9,4 @@ # # Specific to this module -exclude_list=common_sm_mmap.c;common_sm_mmap.h;common_sm_sysv.c;common_sm_sysv.h +exclude_list=common_sm_mmap.c;common_sm_mmap.h;common_sm_sysv.c;common_sm_sysv.h;common_sm_posix.c;common_sm_posix.h