[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-560-gada4028
Brad King
brad.king at kitware.com
Sun Feb 26 10:44:05 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via ada4028f25cbac073191b7e466b19281eebd9f29 (commit)
via 53a2377962a50934e695abc8879e944dc27e0ff8 (commit)
from fa678294b653cb39dda9e631e24aead5a308cb78 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ada4028f25cbac073191b7e466b19281eebd9f29
commit ada4028f25cbac073191b7e466b19281eebd9f29
Merge: fa67829 53a2377
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 26 10:44:04 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 26 10:44:04 2017 -0500
Merge topic '16607-error-out-on-non-seekable-input-files' into next
53a23779 fixup! cmListFileLexer: bail out on seek-errors
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53a2377962a50934e695abc8879e944dc27e0ff8
commit 53a2377962a50934e695abc8879e944dc27e0ff8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 26 10:22:28 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 26 10:22:28 2017 -0500
fixup! cmListFileLexer: bail out on seek-errors
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 0c79856..18d487e 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -304,9 +304,11 @@ run_cmake_depends()
function(reject_fifo)
find_program(BASH_EXECUTABLE bash)
- if(CMAKE_HOST_UNIX AND BASH_EXECUTABLE)
+ if(BASH_EXECUTABLE)
set(BASH_COMMAND_ARGUMENT "'${CMAKE_COMMAND}' -P <(echo 'return()')")
run_cmake_command(reject_fifo ${BASH_EXECUTABLE} -c ${BASH_COMMAND_ARGUMENT})
endif()
endfunction()
-reject_fifo()
+if(CMAKE_HOST_UNIX AND NOT CYGWIN)
+ reject_fifo()
+endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list