ECMFindModuleHelpers: set traditional variables

The traditional *_LIBRARIES, *_INCLUDE_DIRS and *_DEFINITIONS do have
some uses - they make it easier to create package config files that use
found libraries in their link interface.  So this makes sure these
variables are set by ecm_find_package_handle_library_components() (and
hence by FindWayland.cmake and FindXCB.cmake).

REVIEW: 117585

2 files changed, 32 insertions, 10 deletions

diff --git a/find-modules/FindWayland.cmake b/find-modules/FindWayland.cmake
index b7790e75..79c93c81 100644
--- a/find-modules/FindWayland.cmake
+++ b/find-modules/FindWayland.cmake
@@ -20,6 +20,18 @@
 #     True if (the requestion version of) Wayland is available
 # ``Wayland_VERSION``
 #     Found Wayland version
+# ``Wayland_TARGETS``
+#     A list of all targets imported by this module (note that there may be more
+#     than the components that were requested)
+# ``Wayland_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the imported
+#     targets
+# ``Wayland_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the targets are
+#     not used for linking
+# ``Wayland_DEFINITIONS``
+#     This should be passed to target_compile_options() if the targets are not
+#     used for linking
 #
 # For each searched-for components, ``Wayland_<component>_FOUND`` will be set to
 # true if the corresponding Wayland library was found, and false otherwise.  If
@@ -28,11 +40,10 @@
 # determine ``Wayland_*_VERSION`` variables for each imported target, although
 # ``Wayland_VERSION`` should normally be sufficient.
 #
-# The following variable will also be defined for convenience, and for
-# compatibility with old-style find module conventions:
-#
-# ``Wayland_LIBRARIES``
-#     A list of all Wayland imported targets
+# In general we recommend using the imported targets, as they are easier to use
+# and provide more control.  Bear in mind, however, that if any target is in the
+# link interface of an exported library, it must be made available by the
+# package config file.
 
 #=============================================================================
 # Copyright 2014 Alex Merry <alex.merry@kde.org>
diff --git a/find-modules/FindXCB.cmake b/find-modules/FindXCB.cmake
index dd876b21..8027bdf3 100644
--- a/find-modules/FindXCB.cmake
+++ b/find-modules/FindXCB.cmake
@@ -27,6 +27,18 @@
 #     True if (the requestion version of) xcb is available
 # ``XCB_VERSION``
 #     Found xcb version
+# ``XCB_TARGETS``
+#     A list of all targets imported by this module (note that there may be more
+#     than the components that were requested)
+# ``XCB_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the imported
+#     targets
+# ``XCB_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the targets are
+#     not used for linking
+# ``XCB_DEFINITIONS``
+#     This should be passed to target_compile_options() if the targets are not
+#     used for linking
 #
 # For each searched-for components, ``XCB_<component>_FOUND`` will be set to
 # true if the corresponding xcb library was found, and false otherwise.  If
@@ -35,11 +47,10 @@
 # ``XCB_*_VERSION`` variables for each imported target, although
 # ``XCB_VERSION`` should normally be sufficient.
 #
-# The following variable will also be defined for convenience, and for
-# compatibility with old-style find module conventions:
-#
-# ``XCB_LIBRARIES``
-#     A list of all XCB imported targets
+# In general we recommend using the imported targets, as they are easier to use
+# and provide more control.  Bear in mind, however, that if any target is in the
+# link interface of an exported library, it must be made available by the
+# package config file.
 
 #=============================================================================
 # Copyright 2011 Fredrik Höglund <fredrik@kde.org>