[cmake-commits] king committed CMakeCCompilerId.c 1.1.2.3 1.1.2.4 CMakeCXXCompilerId.cpp 1.1.2.3 1.1.2.4 CMakeDetermineCompilerId.cmake 1.1.2.3 1.1.2.4 CMakeLists.txt 1.7 1.7.10.1 FindMPI.cmake 1.11 1.11.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv18563

Modified Files:
      Tag: CMake-Modules-CompilerId
	CMakeCCompilerId.c CMakeCXXCompilerId.cpp 
	CMakeDetermineCompilerId.cmake CMakeLists.txt FindMPI.cmake 
Log Message:
ENH: Merging modules changes in range CMake-Modules-CompilerId-mp1-post to CMake-Modules-CompilerId-trunk-mp1 from trunk to CMake-Modules-CompilerId branch.


Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- FindMPI.cmake	3 Nov 2006 00:58:14 -0000	1.11
+++ FindMPI.cmake	1 May 2007 22:22:19 -0000	1.11.2.1
@@ -4,11 +4,9 @@
 #  MPI_INCLUDE_PATH = where mpi.h can be found
 #  MPI_LIBRARY    = the library to link in (mpi mpich etc)
 
-FIND_PATH(MPI_INCLUDE_PATH mpi.h 
-          /usr/local/include 
-          /usr/include 
-          /usr/include/mpi
-          /usr/local/mpi/include
+FIND_PATH(MPI_INCLUDE_PATH NAMES mpi.h 
+          PATH_SUFFIXES mpi mpi/include
+          PATHS
           "$ENV{ProgramFiles}/MPICH/SDK/Include"
           "$ENV{ProgramFiles}/MPICH2/include"
           "C:/Program Files/MPICH/SDK/Include" 
@@ -16,7 +14,8 @@
 
 FIND_LIBRARY(MPI_LIBRARY 
              NAMES mpich2 mpi mpich 
-             PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
+             PATH_SUFFIXES mpi/lib
+             PATHS
              "$ENV{ProgramFiles}/MPICH/SDK/Lib"
              "$ENV{ProgramFiles}/MPICH2/Lib"
              "C:/Program Files/MPICH/SDK/Lib" 
@@ -24,7 +23,8 @@
 
 FIND_LIBRARY(MPI_EXTRA_LIBRARY 
              NAMES mpi++
-             PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib 
+             PATH_SUFFIXES mpi/lib
+             PATHS
              "$ENV{ProgramFiles}/MPICH/SDK/Lib"
              "C:/Program Files/MPICH/SDK/Lib" 
              DOC "If a second mpi library is necessary, specify it here.")

Index: CMakeCCompilerId.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompilerId.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- CMakeCCompilerId.c	27 Apr 2007 14:19:15 -0000	1.1.2.3
+++ CMakeCCompilerId.c	1 May 2007 22:22:19 -0000	1.1.2.4
@@ -22,7 +22,7 @@
 #elif defined(__IBMC__)
 "VisualAge"
 #elif defined(__GNUC__)
-"GNUC"
+"GNU"
 #elif defined(_MSC_VER)
 "MSVC"
 #elif defined(_COMPILER_VERSION)

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeLists.txt,v
retrieving revision 1.7
retrieving revision 1.7.10.1
diff -u -d -r1.7 -r1.7.10.1
--- CMakeLists.txt	11 Aug 2003 21:34:12 -0000	1.7
+++ CMakeLists.txt	1 May 2007 22:22:19 -0000	1.7.10.1
@@ -1,7 +1,9 @@
 # just install the modules
 SUBDIRS(Platform)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.cmake$)
+INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.cpp$)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.cxx$)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.in$)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.c$)
+INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.h$)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules readme\\.txt$)

Index: CMakeDetermineCompilerId.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerId.cmake,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- CMakeDetermineCompilerId.cmake	27 Apr 2007 14:29:57 -0000	1.1.2.3
+++ CMakeDetermineCompilerId.cmake	1 May 2007 22:22:19 -0000	1.1.2.4
@@ -1,6 +1,8 @@
 
 # Macro to compile a source file to identify the compiler.  This is
 # used internally by CMake and should not be included by user code.
+# If successful, sets CMAKE_<lang>_COMPILER_ID and CMAKE_<lang>_PLATFORM_ID
+
 MACRO(CMAKE_DETERMINE_COMPILER_ID lang src)
   # Store the compiler identification source file.
   SET(CMAKE_${lang}_COMPILER_ID_SRC "${src}")

Index: CMakeCXXCompilerId.cpp
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompilerId.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- CMakeCXXCompilerId.cpp	27 Apr 2007 14:19:15 -0000	1.1.2.3
+++ CMakeCXXCompilerId.cpp	1 May 2007 22:22:19 -0000	1.1.2.4
@@ -1,3 +1,6 @@
+/* This source file must have a .cpp extension so that all C++ compilers
+   recognize the extension without flags.  Borland does not know .cxx for
+   example.  */
 #ifndef __cplusplus
 # error "A C compiler has been selected for C++."
 #endif
@@ -20,7 +23,7 @@
 #elif defined(__IBMCPP__)
 "VisualAge"
 #elif defined(__GNUC__)
-"GNUC"
+"GNU"
 #elif defined(_MSC_VER)
 "MSVC"
 #elif defined(_COMPILER_VERSION)