From e6c0133d089b3d43bf62d4fdf6107ee987d06e90 Mon Sep 17 00:00:00 2001 From: Shiqing Fan Date: Mon, 28 Dec 2009 16:13:41 +0000 Subject: [PATCH] Add a definition for CMake to disable KNEM on Windows. This commit was SVN r22345. --- contrib/platform/win32/CMakeModules/ompi_configure.cmake | 2 ++ contrib/platform/win32/ConfigFiles/opal_config.h.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contrib/platform/win32/CMakeModules/ompi_configure.cmake b/contrib/platform/win32/CMakeModules/ompi_configure.cmake index d263ece9b3..eb2495937e 100644 --- a/contrib/platform/win32/CMakeModules/ompi_configure.cmake +++ b/contrib/platform/win32/CMakeModules/ompi_configure.cmake @@ -134,6 +134,8 @@ SET(OMPI_F90_ABSOLUTE "\"none\"") SET(OMPI_F90_BUILD_SIZE "\"small\"") +SET(OMPI_BTL_SM_HAVE_KNEM 0) + # set the im/export decleration here. # Don't bother with OMPI_IMPORTS IF(BUILD_SHARED_LIBS) diff --git a/contrib/platform/win32/ConfigFiles/opal_config.h.cmake b/contrib/platform/win32/ConfigFiles/opal_config.h.cmake index df2eb37b9b..72cd572a49 100644 --- a/contrib/platform/win32/ConfigFiles/opal_config.h.cmake +++ b/contrib/platform/win32/ConfigFiles/opal_config.h.cmake @@ -65,6 +65,8 @@ #define OPAL_BUILD_PLATFORM_COMPILER_VERSION_STR ${COMPILER_VERSION} +#define OMPI_BTL_SM_HAVE_KNEM ${OMPI_BTL_SM_HAVE_KNEM} + /* Maximum length of datarep strings (default is 128) */ #define OPAL_MAX_DATAREP_STRING ${OPAL_MAX_DATAREP_STRING}