From d1a7756547a26c3ec0cfba84f138066aef5bc0aa Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Aug 2017 10:35:07 -0400 Subject: 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. --- Modules/FindLibXml2.cmake | 7 +++++++ 1 file changed, 7 insertions(+) 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} -- cgit v0.12