Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Cristian Adam
CMake
Commits
8c89b5e2
Commit
8c89b5e2
authored
Feb 26, 2010
by
Bill Hoffman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMake 2.8.1
parent
1274ce5b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
CMakeLists.txt
CMakeLists.txt
+1
-1
ChangeLog.manual
ChangeLog.manual
+4
-0
Modules/FindMPI.cmake
Modules/FindMPI.cmake
+1
-0
Tests/CMakeLists.txt
Tests/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
8c89b5e2
...
@@ -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.
...
...
ChangeLog.manual
View file @
8c89b5e2
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.
...
...
Modules/FindMPI.cmake
View file @
8c89b5e2
...
@@ -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
}
)
...
...
Tests/CMakeLists.txt
View file @
8c89b5e2
...
@@ -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
}
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment