[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-885-gcd060d3

[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  cd060d3aa1a0d2f5bf86301251d2e64650b9f50d (commit)
       via  1c52e6511fe3b73c640862f76884dcfed46186dc (commit)
       via  4c802a326b76d776c895ebbe3c0ebf2a0e223ba2 (commit)
      from  c7d27ed8ffa6d486b0e91654c1a6b14de73ab673 (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=cd060d3aa1a0d2f5bf86301251d2e64650b9f50d
commit cd060d3aa1a0d2f5bf86301251d2e64650b9f50d
Merge: c7d27ed 1c52e65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 2 08:54:37 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 2 08:54:37 2016 -0400

    Merge topic 'doc-cmake-qt-fixes' into next
    
    1c52e651 Help: Update example Qt 5 find_package call to add missing component
    4c802a32 Help: Update example Qt 5 find_package call to use COMPONENTS


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c52e6511fe3b73c640862f76884dcfed46186dc
commit 1c52e6511fe3b73c640862f76884dcfed46186dc
Author:     Thiago M. de C. Marques <thiago_manhente at live.com>
AuthorDate: Tue Nov 1 17:04:13 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 2 08:51:57 2016 -0400

    Help: Update example Qt 5 find_package call to add missing component
    
    Running CMake on it caused the following error:
    
        error: Target "publisher" links to target "Qt5::DBus" but the target
        was not found.  Perhaps a find_package() call is missing for an
        IMPORTED target, or an ALIAS target is missing?
    
    Add the missing DBus component.

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index bd0a984..7827065 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -29,7 +29,7 @@ Qt 4 and Qt 5 may be used together in the same
   set(CMAKE_AUTOMOC ON)
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-  find_package(Qt5 COMPONENTS Widgets REQUIRED)
+  find_package(Qt5 COMPONENTS Widgets DBus REQUIRED)
   add_executable(publisher publisher.cpp)
   target_link_libraries(publisher Qt5::Widgets Qt5::DBus)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c802a326b76d776c895ebbe3c0ebf2a0e223ba2
commit 4c802a326b76d776c895ebbe3c0ebf2a0e223ba2
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Tue Nov 1 12:44:34 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 2 08:51:53 2016 -0400

    Help: Update example Qt 5 find_package call to use COMPONENTS

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index e8a2c1e..bd0a984 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -29,7 +29,7 @@ Qt 4 and Qt 5 may be used together in the same
   set(CMAKE_AUTOMOC ON)
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-  find_package(Qt5Widgets REQUIRED)
+  find_package(Qt5 COMPONENTS Widgets REQUIRED)
   add_executable(publisher publisher.cpp)
   target_link_libraries(publisher Qt5::Widgets Qt5::DBus)
 

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

Summary of changes:


hooks/post-receive
-- 
CMake