[Cmake-commits] CMake branch, next, updated. v3.6.2-1918-ge0aa392

[Brad King]

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  e0aa392d59fed43a0de907fc31518adc8ca1d74e (commit)
       via  f74feae77f3e0eba265c0255af8cddb93b4482df (commit)
      from  2758bf0877fb0c157aaa4b730e138bbad1bf12a3 (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=e0aa392d59fed43a0de907fc31518adc8ca1d74e
commit e0aa392d59fed43a0de907fc31518adc8ca1d74e
Merge: 2758bf0 f74feae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 9 15:07:18 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 9 15:07:18 2016 -0400

    Merge topic 'geh-failure-tests' into next
    
    f74feae7 Tests: Fix GenerateExportHeader failure tests on Cygwin


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f74feae77f3e0eba265c0255af8cddb93b4482df
commit f74feae77f3e0eba265c0255af8cddb93b4482df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 9 15:02:23 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 9 15:03:04 2016 -0400

    Tests: Fix GenerateExportHeader failure tests on Cygwin
    
    They need to be conditioned just as Windows.

diff --git a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
index 4ba6abd..db1ab49 100644
--- a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
@@ -72,17 +72,17 @@ int main()
     libshared::ExportedClass l;
     l.method();
     l.method_deprecated();
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
     l.method_excluded();
 #else
-    //l.method_excluded(); LINK ERROR (NOT WIN32)
+    //l.method_excluded(); LINK ERROR (NOT WIN32 AND NOT CYGWIN)
 #endif
 
     use_int(l.data);
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
     use_int(l.data_excluded);
 #else
-    //use_int(l.data_excluded); LINK ERROR (NOT WIN32)
+    //use_int(l.data_excluded); LINK ERROR (NOT WIN32 AND NOT CYGWIN)
 #endif
   }
 

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake