From 14e69524827c21456a61da47f99557b1a5e63fd0 Mon Sep 17 00:00:00 2001
From: Shiqing Fan <shiqing@hlrs.de>
Date: Tue, 6 Oct 2009 08:01:37 +0000
Subject: [PATCH] Update two CMake find modules.

This commit was SVN r22054.
---
 .../CMakeModules/check_mca_subdirs.cmake      |  1 +
 .../win32/CMakeModules/find_ccp.cmake         | 28 ++++++++++---------
 .../win32/CMakeModules/find_libltdl.cmake     |  4 +--
 .../win32/CMakeModules/ompi_configure.cmake   |  4 ++-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake b/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake
index 708ed8fb69..81aae1bcd9 100644
--- a/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake
+++ b/contrib/platform/win32/CMakeModules/check_mca_subdirs.cmake
@@ -133,6 +133,7 @@ FOREACH (MCA_FRAMEWORK ${MCA_FRAMEWORK_LIST})
         SET(EXTRA_INCLUDE_PATH "")
         IF(NOT REQUIRED_CHECK STREQUAL "")
           STRING(REPLACE "required_check=" "" REQUIRED_CHECK ${REQUIRED_CHECK})
+          UNSET(RESULT_INCLUDE_PATH)
           INCLUDE(${REQUIRED_CHECK})
           IF(RESULT)
             SET(EXTRA_INCLUDE_PATH ${RESULT_INCLUDE_PATH})
diff --git a/contrib/platform/win32/CMakeModules/find_ccp.cmake b/contrib/platform/win32/CMakeModules/find_ccp.cmake
index 8f3e5b67b5..b6ddd985fe 100644
--- a/contrib/platform/win32/CMakeModules/find_ccp.cmake
+++ b/contrib/platform/win32/CMakeModules/find_ccp.cmake
@@ -10,31 +10,33 @@
 # The CCP components need to import the type library ccpapi.tlb,
 # if it's not installed, the CCP components won't be built.
 
-SET(EXTRA_INCLUDE_PATH "")
+# This module is included in a .windows file, it must return two variables:
+# RESULT               : find result
+# RESULT_INCLUDE_PATH  : the path need to include if RESULT is true
 
-IF(NOT OMPI_WANT_CCP)
+IF(NOT ORTE_WANT_CCP)
   SET(RESULT FALSE)
-ELSEIF(NOT CCPAPI_FOUND)
+ELSEIF(NOT CCP_FOUND)
   MESSAGE(STATUS "looking for ccp...")
 
   IF(CMAKE_CL_64)
-    SET(CCP_LIB_PATH $ENV{CCP_LIB64} CACHE PATH "CCP library path" FORCE)
+    FIND_PATH(CCP_LIB_PATH ccpapi.tlb PATHS $ENV{CCP_LIB64} )
   ELSE(CMAKE_CL_64)
-    SET(CCP_LIB_PATH $ENV{CCP_LIB32} CACHE PATH "CCP library path" FORCE)
+    FIND_PATH(CCP_LIB_PATH ccpapi.tlb PATHS $ENV{CCP_LIB32} )
   ENDIF(CMAKE_CL_64)
 
-  FIND_FILE(CCPAPI_FOUND ccpapi.tlb PATHS ${CCP_LIB_PATH})
-
-  IF(CCPAPI_FOUND)
+  IF(CCP_LIB_PATH)
+    SET(CCP_FOUND TRUE CACHE INTERNAL "find result of CCP.")
     SET(RESULT TRUE)
     SET(RESULT_INCLUDE_PATH ${CCP_LIB_PATH})
     MESSAGE(STATUS "looking for ccp...found.")
-  ELSE(CCPAPI_FOUND)
+  ELSE(CCP_LIB_PATH)
+    SET(CCP_FOUND FALSE CACHE INTERNAL "find result of CCP.")
     SET(RESULT FALSE)   
-    MESSAGE(STATUS "looking for ccp...not found.")
-  ENDIF(CCPAPI_FOUND)
+    MESSAGE(STATUS "looking for ccp...failed.")
+  ENDIF(CCP_LIB_PATH)
 
-ELSE(NOT CCPAPI_FOUND)
+ELSE(NOT CCP_FOUND)
   SET(RESULT_INCLUDE_PATH ${CCP_LIB_PATH})
   SET(RESULT TRUE)
-ENDIF(NOT OMPI_WANT_CCP)
+ENDIF(NOT ORTE_WANT_CCP)
diff --git a/contrib/platform/win32/CMakeModules/find_libltdl.cmake b/contrib/platform/win32/CMakeModules/find_libltdl.cmake
index 5ab4929ad4..8e2a7c1d2e 100644
--- a/contrib/platform/win32/CMakeModules/find_libltdl.cmake
+++ b/contrib/platform/win32/CMakeModules/find_libltdl.cmake
@@ -15,7 +15,7 @@
 #  LIBLTDL_INCLUDE_PATH   - path to ltdl.h
 #  LIBLTDL_FOUND          - system has Libltdl
 #
-SET(EXTRA_INCLUDE_PATH "")
+
 SET(LIBLTDL_PATH "" CACHE PATH "Path to libltdl root directory.")
 
 IF(NOT OPAL_WANT_LIBLTDL)
@@ -46,8 +46,6 @@ ELSE(NOT OPAL_WANT_LIBLTDL)
       MESSAGE(STATUS "looking for libltdl...failed.")
     ENDIF(LIBLTDL_LIB AND LIBLTDL_INCLUDE_PATH)
 
-  ELSE(NOT LIBLTDL_FOUND OR NOT "${LIBLTDL_PATH}" STREQUAL "${LIBLTDL_OLD_PATH}")
-    SET(LIBLTDL_FOUND TRUE CACHE INTERNAL "find result of libltdl.")
   ENDIF(NOT LIBLTDL_FOUND OR NOT "${LIBLTDL_PATH}" STREQUAL "${LIBLTDL_OLD_PATH}")
 
 ENDIF(NOT OPAL_WANT_LIBLTDL)
diff --git a/contrib/platform/win32/CMakeModules/ompi_configure.cmake b/contrib/platform/win32/CMakeModules/ompi_configure.cmake
index b8e6e7515d..7771ec10ad 100644
--- a/contrib/platform/win32/CMakeModules/ompi_configure.cmake
+++ b/contrib/platform/win32/CMakeModules/ompi_configure.cmake
@@ -392,7 +392,7 @@ ELSE(NOT OMPI_WANT_MPI_INTERFACE_WARNING)
   SET (OMPI_WANT_MPI_INTERFACE_WARNING 1)
 ENDIF(NOT OMPI_WANT_MPI_INTERFACE_WARNING)
 
-OPTION(OMPI_WANT_CCP
+OPTION(ORTE_WANT_CCP
   "Whether we want to have the CCP remote process launch support." ON)
 
 SET (OMPI_EXT_COMPONENTS Example CACHE STRING 
@@ -410,6 +410,8 @@ ELSE(NOT OPAL_WANT_LIBLTDL)
   ENDIF(LIBLTDL_FOUND)
 ENDIF(NOT OPAL_WANT_LIBLTDL)
 
+OPTION(OMPI_WANT_NETWORK_DIRECT "Whether we want to enable Network Direct support." ON)
+
 
 ###################################################################
 #                           Check headers                         #