diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog.manual | 4 | ||||
| -rw-r--r-- | Modules/FindMPI.cmake | 1 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 93d6c43..c4ab27a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,7 +329,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES) SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 8) SET(CMake_VERSION_PATCH 1) -SET(CMake_VERSION_RC 5) +#SET(CMake_VERSION_RC 5) # We use odd minor numbers for development versions. # Use a date for the development patch level. diff --git a/ChangeLog.manual b/ChangeLog.manual index 147c263..847d9b3 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,7 @@ +Changes in CMake 2.8.1 +- Fix failing test on cygwin +- Add a new serach path for MPICH2 + Changes in CMake 2.8.1 RC 5 - Fix FindQt4 to work with OpenGL on the mac - Add .git .bzr and .hg to the list of default CPack ignore directories. diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 094f9e6..481b0e9 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -86,6 +86,7 @@ set(_MPI_PACKAGE_DIR set(_MPI_PREFIX_PATH) if(WIN32) list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..") + list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH2;Path]") endif() foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH}) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 8a83d72..b7c0781 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1268,10 +1268,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel --output-log "${CMake_BINARY_DIR}/Tests/CTestTestBadExe/testOutput.log" ) SET(CTestTestBadExe_REGEX "BAD_COMMAND") - # cygwin can not be made to produce a BAD_COMMAND error + # some cygwin can not be made to produce a BAD_COMMAND error # the best we can get from it is a failed test IF(CYGWIN) - SET(CTestTestBadExe_REGEX "\\*\\*\\*Failed") + SET(CTestTestBadExe_REGEX "(\\*\\*\\*Failed)|BAD_COMMAND") ENDIF() SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES PASS_REGULAR_EXPRESSION "${CTestTestBadExe_REGEX}") |