Commit 8c89b5e2 authored by Bill Hoffman's avatar Bill Hoffman

CMake 2.8.1

parent 1274ce5b
...@@ -329,7 +329,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES) ...@@ -329,7 +329,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES)
SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 8) SET(CMake_VERSION_MINOR 8)
SET(CMake_VERSION_PATCH 1) SET(CMake_VERSION_PATCH 1)
SET(CMake_VERSION_RC 5) #SET(CMake_VERSION_RC 5)
# We use odd minor numbers for development versions. # We use odd minor numbers for development versions.
# Use a date for the development patch level. # Use a date for the development patch level.
......
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 Changes in CMake 2.8.1 RC 5
- Fix FindQt4 to work with OpenGL on the mac - Fix FindQt4 to work with OpenGL on the mac
- Add .git .bzr and .hg to the list of default CPack ignore directories. - Add .git .bzr and .hg to the list of default CPack ignore directories.
......
...@@ -86,6 +86,7 @@ set(_MPI_PACKAGE_DIR ...@@ -86,6 +86,7 @@ set(_MPI_PACKAGE_DIR
set(_MPI_PREFIX_PATH) set(_MPI_PREFIX_PATH)
if(WIN32) if(WIN32)
list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..") list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH2;Path]")
endif() endif()
foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH}) foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH})
......
...@@ -1268,10 +1268,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel ...@@ -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" --output-log "${CMake_BINARY_DIR}/Tests/CTestTestBadExe/testOutput.log"
) )
SET(CTestTestBadExe_REGEX "BAD_COMMAND") 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 # the best we can get from it is a failed test
IF(CYGWIN) IF(CYGWIN)
SET(CTestTestBadExe_REGEX "\\*\\*\\*Failed") SET(CTestTestBadExe_REGEX "(\\*\\*\\*Failed)|BAD_COMMAND")
ENDIF() ENDIF()
SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES
PASS_REGULAR_EXPRESSION "${CTestTestBadExe_REGEX}") PASS_REGULAR_EXPRESSION "${CTestTestBadExe_REGEX}")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment