diff --git a/libxml2-config.cmake.cmake.in b/libxml2-config.cmake.cmake.in index 79e9ecc3..f1b5676a 100644 --- a/libxml2-config.cmake.cmake.in +++ b/libxml2-config.cmake.cmake.in @@ -31,55 +31,55 @@ set(LIBXML2_INCLUDE_DIR ${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@/libx set(LIBXML2_LIBRARY_DIR ${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@) macro(select_library_location target basename) - if(TARGET ${target}) - foreach(property IN ITEMS IMPORTED_LOCATION IMPORTED_IMPLIB) - get_target_property(${basename}_${property}_DEBUG ${target} ${property}_DEBUG) - get_target_property(${basename}_${property}_MINSIZEREL ${target} ${property}_MINSIZEREL) - get_target_property(${basename}_${property}_NOCONFIG ${target} ${property}_NOCONFIG) - get_target_property(${basename}_${property}_RELEASE ${target} ${property}_RELEASE) - get_target_property(${basename}_${property}_RELWITHDEBINFO ${target} ${property}_RELWITHDEBINFO) + if(TARGET ${target}) + foreach(property IN ITEMS IMPORTED_LOCATION IMPORTED_IMPLIB) + get_target_property(${basename}_${property}_DEBUG ${target} ${property}_DEBUG) + get_target_property(${basename}_${property}_MINSIZEREL ${target} ${property}_MINSIZEREL) + get_target_property(${basename}_${property}_NOCONFIG ${target} ${property}_NOCONFIG) + get_target_property(${basename}_${property}_RELEASE ${target} ${property}_RELEASE) + get_target_property(${basename}_${property}_RELWITHDEBINFO ${target} ${property}_RELWITHDEBINFO) - if(${basename}_${property}_DEBUG AND ${basename}_${property}_RELEASE) - set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_RELEASE}) - elseif(${basename}_${property}_DEBUG AND ${basename}_${property}_RELWITHDEBINFO) - set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_RELWITHDEBINFO}) - elseif(${basename}_${property}_DEBUG AND ${basename}_${property}_MINSIZEREL) - set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_MINSIZEREL}) - elseif(${basename}_${property}_RELEASE) - set(${basename}_LIBRARY ${${basename}_${property}_RELEASE}) - elseif(${basename}_${property}_RELWITHDEBINFO) - set(${basename}_LIBRARY ${${basename}_${property}_RELWITHDEBINFO}) - elseif(${basename}_${property}_MINSIZEREL) - set(${basename}_LIBRARY ${${basename}_${property}_MINSIZEREL}) - elseif(${basename}_${property}_DEBUG) - set(${basename}_LIBRARY ${${basename}_${property}_DEBUG}) - elseif(${basename}_${property}_NOCONFIG) - set(${basename}_LIBRARY ${${basename}_${property}_NOCONFIG}) - endif() - endforeach() - endif() + if(${basename}_${property}_DEBUG AND ${basename}_${property}_RELEASE) + set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_RELEASE}) + elseif(${basename}_${property}_DEBUG AND ${basename}_${property}_RELWITHDEBINFO) + set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_RELWITHDEBINFO}) + elseif(${basename}_${property}_DEBUG AND ${basename}_${property}_MINSIZEREL) + set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_MINSIZEREL}) + elseif(${basename}_${property}_RELEASE) + set(${basename}_LIBRARY ${${basename}_${property}_RELEASE}) + elseif(${basename}_${property}_RELWITHDEBINFO) + set(${basename}_LIBRARY ${${basename}_${property}_RELWITHDEBINFO}) + elseif(${basename}_${property}_MINSIZEREL) + set(${basename}_LIBRARY ${${basename}_${property}_MINSIZEREL}) + elseif(${basename}_${property}_DEBUG) + set(${basename}_LIBRARY ${${basename}_${property}_DEBUG}) + elseif(${basename}_${property}_NOCONFIG) + set(${basename}_LIBRARY ${${basename}_${property}_NOCONFIG}) + endif() + endforeach() + endif() endmacro() macro(select_executable_location target basename) - if(TARGET ${target}) - get_target_property(${basename}_IMPORTED_LOCATION_DEBUG ${target} IMPORTED_LOCATION_DEBUG) - get_target_property(${basename}_IMPORTED_LOCATION_MINSIZEREL ${target} IMPORTED_LOCATION_MINSIZEREL) - get_target_property(${basename}_IMPORTED_LOCATION_NOCONFIG ${target} IMPORTED_LOCATION_NOCONFIG) - get_target_property(${basename}_IMPORTED_LOCATION_RELEASE ${target} IMPORTED_LOCATION_RELEASE) - get_target_property(${basename}_IMPORTED_LOCATION_RELWITHDEBINFO ${target} IMPORTED_LOCATION_RELWITHDEBINFO) + if(TARGET ${target}) + get_target_property(${basename}_IMPORTED_LOCATION_DEBUG ${target} IMPORTED_LOCATION_DEBUG) + get_target_property(${basename}_IMPORTED_LOCATION_MINSIZEREL ${target} IMPORTED_LOCATION_MINSIZEREL) + get_target_property(${basename}_IMPORTED_LOCATION_NOCONFIG ${target} IMPORTED_LOCATION_NOCONFIG) + get_target_property(${basename}_IMPORTED_LOCATION_RELEASE ${target} IMPORTED_LOCATION_RELEASE) + get_target_property(${basename}_IMPORTED_LOCATION_RELWITHDEBINFO ${target} IMPORTED_LOCATION_RELWITHDEBINFO) - if(${basename}_IMPORTED_LOCATION_RELEASE) - set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_RELEASE}) - elseif(${basename}_IMPORTED_LOCATION_RELWITHDEBINFO) - set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_RELWITHDEBINFO}) - elseif(${basename}_IMPORTED_LOCATION_MINSIZEREL) - set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_MINSIZEREL}) - elseif(${basename}_IMPORTED_LOCATION_DEBUG) - set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_DEBUG}) - elseif(${basename}_IMPORTED_LOCATION_NOCONFIG) - set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_NOCONFIG}) + if(${basename}_IMPORTED_LOCATION_RELEASE) + set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_RELEASE}) + elseif(${basename}_IMPORTED_LOCATION_RELWITHDEBINFO) + set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_RELWITHDEBINFO}) + elseif(${basename}_IMPORTED_LOCATION_MINSIZEREL) + set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_MINSIZEREL}) + elseif(${basename}_IMPORTED_LOCATION_DEBUG) + set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_DEBUG}) + elseif(${basename}_IMPORTED_LOCATION_NOCONFIG) + set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_NOCONFIG}) + endif() endif() - endif() endmacro() select_library_location(LibXml2::LibXml2 LIBXML2) @@ -99,66 +99,66 @@ set(LIBXML2_WITH_LZMA @LIBXML2_WITH_LZMA@) set(LIBXML2_WITH_ZLIB @LIBXML2_WITH_ZLIB@) if(LIBXML2_WITH_ICONV) - find_dependency(Iconv) - list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) - list(APPEND LIBXML2_INCLUDE_DIRS ${Iconv_INCLUDE_DIRS}) - if(NOT Iconv_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Iconv dependency was not found") - return() - endif() + find_dependency(Iconv) + list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) + list(APPEND LIBXML2_INCLUDE_DIRS ${Iconv_INCLUDE_DIRS}) + if(NOT Iconv_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Iconv dependency was not found") + return() + endif() endif() if(NOT LIBXML2_SHARED) - set(LIBXML2_DEFINITIONS -DLIBXML_STATIC) + set(LIBXML2_DEFINITIONS -DLIBXML_STATIC) - if(LIBXML2_WITH_THREADS) - find_dependency(Threads) - list(APPEND LIBXML2_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - if(NOT Threads_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Threads dependency was not found") - return() + if(LIBXML2_WITH_THREADS) + find_dependency(Threads) + list(APPEND LIBXML2_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + if(NOT Threads_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Threads dependency was not found") + return() + endif() endif() - endif() - if(LIBXML2_WITH_ICU) - find_dependency(ICU COMPONENTS data i18n uc) - list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES}) - if(NOT ICU_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found") - return() + if(LIBXML2_WITH_ICU) + find_dependency(ICU COMPONENTS data i18n uc) + list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES}) + if(NOT ICU_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found") + return() + endif() endif() - endif() - if(LIBXML2_WITH_LZMA) - find_dependency(LibLZMA) - list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES}) - if(NOT LibLZMA_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "LibLZMA dependency was not found") - return() + if(LIBXML2_WITH_LZMA) + find_dependency(LibLZMA) + list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES}) + if(NOT LibLZMA_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "LibLZMA dependency was not found") + return() + endif() endif() - endif() - if(LIBXML2_WITH_ZLIB) - find_dependency(ZLIB) - list(APPEND LIBXML2_LIBRARIES ${ZLIB_LIBRARIES}) - if(NOT ZLIB_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ZLIB dependency was not found") - return() + if(LIBXML2_WITH_ZLIB) + find_dependency(ZLIB) + list(APPEND LIBXML2_LIBRARIES ${ZLIB_LIBRARIES}) + if(NOT ZLIB_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ZLIB dependency was not found") + return() + endif() endif() - endif() - if(UNIX) - list(APPEND LIBXML2_LIBRARIES m) - endif() + if(UNIX) + list(APPEND LIBXML2_LIBRARIES m) + endif() - if(WIN32) - list(APPEND LIBXML2_LIBRARIES ws2_32;Bcrypt) - endif() + if(WIN32) + list(APPEND LIBXML2_LIBRARIES ws2_32;Bcrypt) + endif() endif() # whether libxml2 has dso support diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in index f35eb056..d128cd20 100644 --- a/libxml2-config.cmake.in +++ b/libxml2-config.cmake.in @@ -52,69 +52,69 @@ set(LIBXML2_WITH_LZMA @WITH_LZMA@) set(LIBXML2_WITH_ZLIB @WITH_ZLIB@) if(LIBXML2_WITH_ICONV) - find_dependency(Iconv) - list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) - list(APPEND LIBXML2_INCLUDE_DIRS ${Iconv_INCLUDE_DIRS}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "Iconv::Iconv") - if(NOT Iconv_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Iconv dependency was not found") - return() - endif() + find_dependency(Iconv) + list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) + list(APPEND LIBXML2_INCLUDE_DIRS ${Iconv_INCLUDE_DIRS}) + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "Iconv::Iconv") + if(NOT Iconv_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Iconv dependency was not found") + return() + endif() endif() if(LIBXML2_WITH_THREADS) - find_dependency(Threads) - list(APPEND LIBXML2_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") - if(NOT Threads_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Threads dependency was not found") - return() - endif() + find_dependency(Threads) + list(APPEND LIBXML2_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") + if(NOT Threads_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Threads dependency was not found") + return() + endif() endif() if(LIBXML2_WITH_ICU) - find_dependency(ICU COMPONENTS data i18n uc) - list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$;\$;\$") - if(NOT ICU_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found") - return() - endif() + find_dependency(ICU COMPONENTS data i18n uc) + list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES}) + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$;\$;\$") + if(NOT ICU_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found") + return() + endif() endif() if(LIBXML2_WITH_LZMA) - find_dependency(LibLZMA) - list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") - if(NOT LibLZMA_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "LibLZMA dependency was not found") - return() - endif() + find_dependency(LibLZMA) + list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES}) + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") + if(NOT LibLZMA_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "LibLZMA dependency was not found") + return() + endif() endif() if(LIBXML2_WITH_ZLIB) - find_dependency(ZLIB) - list(APPEND LIBXML2_LIBRARIES ${ZLIB_LIBRARIES}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") - if(NOT ZLIB_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ZLIB dependency was not found") - return() - endif() + find_dependency(ZLIB) + list(APPEND LIBXML2_LIBRARIES ${ZLIB_LIBRARIES}) + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") + if(NOT ZLIB_FOUND) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ZLIB dependency was not found") + return() + endif() endif() if(UNIX) - list(APPEND LIBXML2_LIBRARIES m) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") + list(APPEND LIBXML2_LIBRARIES m) + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") endif() if(WIN32) - list(APPEND LIBXML2_LIBRARIES ws2_32;Bcrypt) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$;\$") + list(APPEND LIBXML2_LIBRARIES ws2_32;Bcrypt) + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$;\$") endif() # whether libxml2 has dso support @@ -123,23 +123,23 @@ set(LIBXML2_MODULES @WITH_MODULES@) mark_as_advanced(LIBXML2_LIBRARY LIBXML2_XMLCATALOG_EXECUTABLE LIBXML2_XMLLINT_EXECUTABLE) if(DEFINED LIBXML2_LIBRARY AND DEFINED LIBXML2_INCLUDE_DIRS) - set(LIBXML2_FOUND TRUE) + set(LIBXML2_FOUND TRUE) endif() if(NOT TARGET LibXml2::LibXml2 AND DEFINED LIBXML2_LIBRARY AND DEFINED LIBXML2_INCLUDE_DIRS) - add_library(LibXml2::LibXml2 UNKNOWN IMPORTED) - set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION "${LIBXML2_LIBRARY}") - set_target_properties(LibXml2::LibXml2 PROPERTIES INTERFACE_COMPILE_OPTIONS "${LIBXML2_DEFINITIONS}") - set_target_properties(LibXml2::LibXml2 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LIBXML2_INCLUDE_DIRS}") - set_target_properties(LibXml2::LibXml2 PROPERTIES INTERFACE_LINK_LIBRARIES "${LIBXML2_INTERFACE_LINK_LIBRARIES}") + add_library(LibXml2::LibXml2 UNKNOWN IMPORTED) + set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION "${LIBXML2_LIBRARY}") + set_target_properties(LibXml2::LibXml2 PROPERTIES INTERFACE_COMPILE_OPTIONS "${LIBXML2_DEFINITIONS}") + set_target_properties(LibXml2::LibXml2 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LIBXML2_INCLUDE_DIRS}") + set_target_properties(LibXml2::LibXml2 PROPERTIES INTERFACE_LINK_LIBRARIES "${LIBXML2_INTERFACE_LINK_LIBRARIES}") endif() if(NOT TARGET LibXml2::xmlcatalog AND DEFINED LIBXML2_XMLCATALOG_EXECUTABLE) - add_executable(LibXml2::xmlcatalog IMPORTED) - set_target_properties(LibXml2::xmlcatalog PROPERTIES IMPORTED_LOCATION "${LIBXML2_XMLCATALOG_EXECUTABLE}") + add_executable(LibXml2::xmlcatalog IMPORTED) + set_target_properties(LibXml2::xmlcatalog PROPERTIES IMPORTED_LOCATION "${LIBXML2_XMLCATALOG_EXECUTABLE}") endif() if(NOT TARGET LibXml2::xmllint AND DEFINED LIBXML2_XMLLINT_EXECUTABLE) - add_executable(LibXml2::xmllint IMPORTED) - set_target_properties(LibXml2::xmllint PROPERTIES IMPORTED_LOCATION "${LIBXML2_XMLLINT_EXECUTABLE}") + add_executable(LibXml2::xmllint IMPORTED) + set_target_properties(LibXml2::xmllint PROPERTIES IMPORTED_LOCATION "${LIBXML2_XMLLINT_EXECUTABLE}") endif()