[Cmake-commits] CMake branch, master, updated. v3.9.0-380-g901456d

[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  901456d76e769af3868d2163d9345ca53af16353 (commit)
       via  d1a7756547a26c3ec0cfba84f138066aef5bc0aa (commit)
      from  6bef326eb4140444ed70a202bc37af11e0ba158b (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=901456d76e769af3868d2163d9345ca53af16353
commit 901456d76e769af3868d2163d9345ca53af16353
Merge: 6bef326 d1a7756
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 2 20:28:22 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Aug 2 16:28:24 2017 -0400

    Merge topic 'FindLibXml2-compat'
    
    d1a77565 FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIES
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1094


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1a7756547a26c3ec0cfba84f138066aef5bc0aa
commit d1a7756547a26c3ec0cfba84f138066aef5bc0aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 2 10:35:07 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 2 10:35:07 2017 -0400

    FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIES
    
    In commit a1b38865 (FindLibXml2: Switch to standard module variable
    names, 2017-07-11) the cache variable used to store the find_library
    result was renamed.  This breaks projects that set the old variable name
    explicitly.  Fix compatibility with such projects by using the old
    variable as a default if it is set and the new one is not.

diff --git a/Modules/FindLibXml2.cmake b/Modules/FindLibXml2.cmake
index f68628d..8ac2980 100644
--- a/Modules/FindLibXml2.cmake
+++ b/Modules/FindLibXml2.cmake
@@ -50,6 +50,13 @@ find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
    PATH_SUFFIXES libxml2
    )
 
+# CMake 3.9 and below used 'LIBXML2_LIBRARIES' as the name of
+# the cache entry storing the find_library result.  Use the
+# value if it was set by the project or user.
+if(DEFINED LIBXML2_LIBRARIES AND NOT DEFINED LIBXML2_LIBRARY)
+  set(LIBXML2_LIBRARY ${LIBXML2_LIBRARIES})
+endif()
+
 find_library(LIBXML2_LIBRARY NAMES xml2 libxml2
    HINTS
    ${PC_LIBXML_LIBDIR}

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

Summary of changes:
 Modules/FindLibXml2.cmake |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake