[Cmake-commits] CMake branch, master, updated. v3.11.0-519-g8c54628

[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  8c546287ddadedb7263e9c21115add253c3a82a8 (commit)
       via  d9b4dcc91eefd9d045772619ee79fb6d4a43891e (commit)
       via  eb0498357f35317451dd2c41b68c4d9b52af64fc (commit)
       via  f5f72ff844a3130568dbc62517401c5727fcf9ec (commit)
      from  693021601310ee9ecbeff48fcf13e578f7c1ca42 (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=8c546287ddadedb7263e9c21115add253c3a82a8
commit 8c546287ddadedb7263e9c21115add253c3a82a8
Merge: d9b4dcc eb04983
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 17 11:19:03 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 17 07:19:22 2018 -0400

    Merge topic 'implicit-lib-gcceh-file'
    
    eb0498357f Exclude "libgcc_eh" library files from implicit link libraries
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1967


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9b4dcc91eefd9d045772619ee79fb6d4a43891e
commit d9b4dcc91eefd9d045772619ee79fb6d4a43891e
Merge: 6930216 f5f72ff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 17 11:18:17 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 17 07:18:35 2018 -0400

    Merge topic 'libuv_version_bump'
    
    f5f72ff844 Explicitly require LibUV 1.10 or higher to build CMake
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1966


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb0498357f35317451dd2c41b68c4d9b52af64fc
commit eb0498357f35317451dd2c41b68c4d9b52af64fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 16 11:50:05 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 16 11:56:23 2018 -0400

    Exclude "libgcc_eh" library files from implicit link libraries
    
    Extend the fix in commit v3.9.6~1^2 (Restore exclusion of "gcc_eh" from
    implicit link libraries, 2017-11-07) to also exclude `gcc_eh` libraries
    referenced by absolute path to the library file.
    
    Issue: #17436

diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake
index 63d18ab..935f92d 100644
--- a/Modules/CMakeParseImplicitLinkInfo.cmake
+++ b/Modules/CMakeParseImplicitLinkInfo.cmake
@@ -142,7 +142,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
   # We remove items that are not language-specific.
   set(implicit_libs "")
   foreach(lib IN LISTS implicit_libs_tmp)
-    if("x${lib}" MATCHES "^x(crt.*\\.o|gcc_eh.*|System.*|.*libclang_rt.*|msvcrt.*|libvcruntime.*|libucrt.*|libcmt.*)$")
+    if("x${lib}" MATCHES "^x(crt.*\\.o|gcc_eh.*|.*libgcc_eh.*|System.*|.*libclang_rt.*|msvcrt.*|libvcruntime.*|libucrt.*|libcmt.*)$")
       string(APPEND log "  remove lib [${lib}]\n")
     elseif(IS_ABSOLUTE "${lib}")
       get_filename_component(abs "${lib}" ABSOLUTE)
diff --git a/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in b/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
index 65487bb..9157c76 100644
--- a/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
+++ b/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in
@@ -349,6 +349,12 @@ set(aix_xlf90_64_libs "xlf90;xlopt;xlf;xlomp_ser;m;c")
 set(aix_xlf90_64_dirs "/usr/lpp/xlf/lib")
 list(APPEND platforms aix_xlf90_64)
 
+# g++ dummy.c -v
+set(aix_g++_text " /prefix/libexec/gcc/powerpc-ibm-aix7.2.0.0/7.2.0/collect2 -bpT:0x10000000 -bpD:0x20000000 -btextro /lib/crt0.o /prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0/crtcxa.o /prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0/crtdbase.o -L/prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0 -L/prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0/../../.. /tmp//ccKROJ1f.o -lstdc++ -lm -lgcc_s /prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0/libgcc.a -lc -lgcc_s /prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0/libgcc.a")
+set(aix_g++_libs "stdc++;m;gcc_s;/prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0/libgcc.a;c;gcc_s;/prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0/libgcc.a")
+set(aix_g++_dirs "/prefix/lib/gcc/powerpc-ibm-aix7.2.0.0/7.2.0;/prefix/lib")
+list(APPEND platforms aix_g++)
+
 #-----------------------------------------------------------------------------
 # HP
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5f72ff844a3130568dbc62517401c5727fcf9ec
commit f5f72ff844a3130568dbc62517401c5727fcf9ec
Author:     ErofeevK <erofeev.info at gmail.com>
AuthorDate: Mon Apr 16 02:48:31 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 16 11:33:52 2018 -0400

    Explicitly require LibUV 1.10 or higher to build CMake
    
    CMake 3.11 now uses `uv_translate_sys_error` introduced in LibUV 1.10.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6623959..3ab679e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -546,7 +546,7 @@ macro (CMAKE_BUILD_UTILITIES)
   #---------------------------------------------------------------------
   # Build libuv library.
   if(CMAKE_USE_SYSTEM_LIBUV)
-    find_package(LibUV 1.0.0)
+    find_package(LibUV 1.10.0)
     if(NOT LIBUV_FOUND)
       message(FATAL_ERROR
         "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")

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

Summary of changes:
 CMakeLists.txt                                 |    2 +-
 Modules/CMakeParseImplicitLinkInfo.cmake       |    2 +-
 Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in |    6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake