[Cmake-commits] CMake branch, master, updated. v3.13.2-758-g2462af2
Kitware Robot
kwrobot at kitware.com
Thu Dec 20 11:23:04 EST 2018
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, master has been updated
via 2462af22bca872e57714d8f22f483b60b4a44d34 (commit)
via 3f915531adc588a552d4528f638badcffbb2f012 (commit)
from 9c41382165cef2524eb2aeff862e6961545f2305 (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=2462af22bca872e57714d8f22f483b60b4a44d34
commit 2462af22bca872e57714d8f22f483b60b4a44d34
Merge: 9c41382 3f91553
Author: Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Thu Dec 20 16:13:26 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 20 11:13:35 2018 -0500
Merge topic 'cygwin-install-test-fix'
3f915531ad Tests: Fix Cygwin failure on RunCMake.install
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2754
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f915531adc588a552d4528f638badcffbb2f012
commit 3f915531adc588a552d4528f638badcffbb2f012
Author: Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Wed Dec 19 12:04:59 2018 -0500
Commit: Kyle Edwards <kyle.edwards at kitware.com>
CommitDate: Wed Dec 19 12:04:59 2018 -0500
Tests: Fix Cygwin failure on RunCMake.install
diff --git a/Tests/RunCMake/install/TARGETS-Defaults-Cache-all-check.cmake b/Tests/RunCMake/install/TARGETS-Defaults-Cache-all-check.cmake
index 6fc735c..57ad6e1 100644
--- a/Tests/RunCMake/install/TARGETS-Defaults-Cache-all-check.cmake
+++ b/Tests/RunCMake/install/TARGETS-Defaults-Cache-all-check.cmake
@@ -21,8 +21,8 @@ elseif(CYGWIN)
[[lib4]]
[[lib4/cyglib4\.dll]]
[[mybin]]
- [[mybin/exe\.exe]]
[[mybin/cyglib1\.dll]]
+ [[mybin/exe\.exe]]
[[myinclude]]
[[myinclude/obj4\.h]]
[[myinclude/obj5\.h]]
diff --git a/Tests/RunCMake/install/TARGETS-Defaults-all-check.cmake b/Tests/RunCMake/install/TARGETS-Defaults-all-check.cmake
index 59209e6..c41cb2a 100644
--- a/Tests/RunCMake/install/TARGETS-Defaults-all-check.cmake
+++ b/Tests/RunCMake/install/TARGETS-Defaults-all-check.cmake
@@ -17,8 +17,8 @@ if(WIN32)
elseif(CYGWIN)
set(_check_files
[[bin]]
- [[bin/exe\.exe]]
[[bin/cyglib1\.dll]]
+ [[bin/exe\.exe]]
[[include]]
[[include/obj4\.h]]
[[include/obj5\.h]]
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/install/TARGETS-Defaults-Cache-all-check.cmake | 2 +-
Tests/RunCMake/install/TARGETS-Defaults-all-check.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list