[Cmake-commits] CMake branch, master, updated. v3.8.1-1297-g048f006

[Kitware Robot]

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  048f0065bf7f76d2c58bb5a0ec4e6cd7bd965dd3 (commit)
       via  1f6509142d4ace26ce134e1c768e5f2249b8a08b (commit)
       via  60afab9e44db242afe915afd73fb6f4924d69069 (commit)
       via  d303465448504d3f91e2991e80a72a3d569f3866 (commit)
      from  def409af76c3222d3635b64398121190345f7c70 (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=048f0065bf7f76d2c58bb5a0ec4e6cd7bd965dd3
commit 048f0065bf7f76d2c58bb5a0ec4e6cd7bd965dd3
Merge: 1f65091 60afab9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 25 19:16:36 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu May 25 15:16:39 2017 -0400

    Merge topic 'c++11-iwyu-decay-and-strip'
    
    60afab9e IWYU: add mapping for std::__decay_and_strip
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !889


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f6509142d4ace26ce134e1c768e5f2249b8a08b
commit 1f6509142d4ace26ce134e1c768e5f2249b8a08b
Merge: def409a d303465
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 25 19:15:06 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu May 25 15:15:16 2017 -0400

    Merge topic 'FindCygwin-alt-arch'
    
    d3034654 FindCygwin: Use find_program instead of find_path
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !883


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60afab9e44db242afe915afd73fb6f4924d69069
commit 60afab9e44db242afe915afd73fb6f4924d69069
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu May 25 00:55:31 2017 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Thu May 25 00:55:40 2017 +0200

    IWYU: add mapping for std::__decay_and_strip

diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp
index a732c9c..3604c0d 100644
--- a/Utilities/IWYU/mapping.imp
+++ b/Utilities/IWYU/mapping.imp
@@ -53,6 +53,19 @@
   # This will still correctly require "cm_auto_ptr.hxx" for CM_AUTO_PTR.
   { symbol: [ "cm::auto_ptr", private, "\"cmConfigure.h\"", public ] },
 
+  # __decay_and_strip is used internally in the C++11 standard library.
+  # IWYU does not classify it as internal and suggests to add <type_traits>.
+  # To ignore it, we simply map it to a file that is included anyway.
+  # TODO: Can this be simplified with an @-expression?
+  #{ symbol: [ "@std::__decay_and_strip<.*>::__type", private, "\"cmConfigure.h\"", public ] },
+  { symbol: [ "std::__decay_and_strip<cmCommand *&>::__type", private, "\"cmConfigure.h\"", public ] },
+  { symbol: [ "std::__decay_and_strip<cmGeneratorTarget *&>::__type", private, "\"cmConfigure.h\"", public ] },
+  { symbol: [ "std::__decay_and_strip<cmFindCommon::PathLabel &>::__type", private, "\"cmConfigure.h\"", public ] },
+  { symbol: [ "std::__decay_and_strip<std::basic_string<char> &>::__type", private, "\"cmConfigure.h\"", public ] },
+  { symbol: [ "std::__decay_and_strip<const std::basic_string<char> &>::__type", private, "\"cmConfigure.h\"", public ] },
+  { symbol: [ "std::__decay_and_strip<cmFindPackageCommand::PathLabel &>::__type", private, "\"cmConfigure.h\"", public ] },
+  { symbol: [ "std::__decay_and_strip<__gnu_cxx::__normal_iterator<const cmCTestTestHandler::cmCTestTestProperties *, std::vector<cmCTestTestHandler::cmCTestTestProperties, std::allocator<cmCTestTestHandler::cmCTestTestProperties> > > &>::__type", private, "\"cmConfigure.h\"", public ] },
+
   # Wrappers for headers added in TR1 / C++11
   # { include: [ "<array>", public, "\"cm_array.hxx\"", public ] },
   # { include: [ "<functional>", public, "\"cm_functional.hxx\"", public ] },

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d303465448504d3f91e2991e80a72a3d569f3866
commit d303465448504d3f91e2991e80a72a3d569f3866
Author:     Tibor Szabo <szabootibor at gmail.com>
AuthorDate: Thu May 18 11:46:47 2017 +0200
Commit:     Tibor Szabo <szabootibor at gmail.com>
CommitDate: Tue May 23 22:51:01 2017 +0200

    FindCygwin: Use find_program instead of find_path
    
    Cygwin's installation directory is mainly needed to use some programs
    of it, irrespectively of the target architecture. However, find_path
    does not consider cygwin with architecture different than the target
    architecture. This is because cygwin's installation path is retrieved
    from the registry. WOW64 view is not used by find_path if generating
    for 32-bit architecture and vice versa, so cygwin is not found then.
    find_program tries both views, this way a 64-bit cygwin may be used
    for 32 bit build and vice versa.

diff --git a/Modules/FindCygwin.cmake b/Modules/FindCygwin.cmake
index 90cbd52..b2ed703 100644
--- a/Modules/FindCygwin.cmake
+++ b/Modules/FindCygwin.cmake
@@ -8,13 +8,13 @@
 # this module looks for Cygwin
 
 if (WIN32)
-  find_path(CYGWIN_INSTALL_PATH
+  find_program(CYGWIN_INSTALL_PATH
     cygwin.bat
     "C:/Cygwin"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygwin\\setup;rootdir]"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]"
   )
-
+  get_filename_component(CYGWIN_INSTALL_PATH "${CYGWIN_INSTALL_PATH}" DIRECTORY)
   mark_as_advanced(
     CYGWIN_INSTALL_PATH
   )

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

Summary of changes:
 Modules/FindCygwin.cmake   |    4 ++--
 Utilities/IWYU/mapping.imp |   13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake