Set up the correct compiler executables in the right place.

This commit was SVN r22560.

contrib/platform/win32/CMakeModules/ompi_check_Microsoft.cmake

@@ -25,8 +25,23 @@ MACRO(OMPI_MICROSOFT_COMPILER)
 
     MESSAGE( STATUS "Start Microsoft specific detection....")
 
+    # search for Microsoft VC tools 
+    SET(VC_BIN_PATH ${VC_BIN_PATH} 
+      "C:/Program Files/Microsoft Visual Studio 9.0/VC/bin" 
+      "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin" 
+      "C:/Program Files/Microsoft Visual Studio 8/VC/BIN" 
+      "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN" 
+      "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN" 
+      "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN" 
+      "$ENV{VS90COMNTOOLS}../../VC/bin" 
+      "$ENV{VS80COMNTOOLS}../../VC/bin")
+
+    FIND_PROGRAM(CL_EXE cl PATHS ${VC_BIN_PATH})
+
     # Set up VS environments.
-    GET_FILENAME_COMPONENT(CL_EXE_PATH ${CMAKE_C_COMPILER} PATH)
+    GET_FILENAME_COMPONENT(CL_EXE_PATH ${CL_EXE} PATH)
+    GET_FILENAME_COMPONENT(CC ${CL_EXE} NAME CACHE)
+    GET_FILENAME_COMPONENT(CXX ${CL_EXE} NAME CACHE)
     GET_FILENAME_COMPONENT(SDK_ROOT_PATH
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" ABSOLUTE CACHE)
     SET(VS_ROOT_DIR ${CL_EXE_PATH}/../../)

ompi/tools/CMakeLists.txt

@@ -49,7 +49,6 @@ ELSE(OMPI_DEBUG_BUILD)
     "libmpi.lib libopen-pal.lib libopen-rte.lib advapi32.lib Ws2_32.lib shlwapi.lib")
 ENDIF(OMPI_DEBUG_BUILD)
 
-GET_FILENAME_COMPONENT(CC "${CL_EXE}" NAME)
 IF(BUILD_SHARED_LIBS)
   SET(OMPI_WRAPPER_EXTRA_CFLAGS
     "/TC /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")
@@ -64,8 +63,6 @@ ENDIF(BUILD_SHARED_LIBS)
 CONFIGURE_WRAPPER_DATA_FILE(mpicc)
 
 IF(OMPI_WANT_CXX_BINDINGS)
-  GET_FILENAME_COMPONENT(CXX "${CL_EXE}" NAME)
-
   IF(BUILD_SHARED_LIBS)
     SET(OMPI_WRAPPER_EXTRA_CXXFLAGS 
       "/TP /EHsc /D \"OMPI_IMPORTS\" /D \"OPAL_IMPORTS\" /D \"ORTE_IMPORTS\"")