diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 57de964a16..bc99ef63bc 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -333,7 +333,7 @@ hunter_default_version(libunibreak VERSION 4.0) hunter_default_version(libusb VERSION 1.0.22) hunter_default_version(libuv VERSION 1.24.0-p1) hunter_default_version(libxdg-basedir VERSION 1.2.0) -hunter_default_version(libxml2 VERSION 2.9.7) +hunter_default_version(libxml2 VERSION 2.9.7-p0) hunter_default_version(libyuv VERSION 1514-p3) hunter_default_version(libzip VERSION 1.5.2-d68a667-p0) hunter_default_version(lmdb VERSION 0.9.21-p2) diff --git a/cmake/projects/libxml2/hunter.cmake b/cmake/projects/libxml2/hunter.cmake index 24ce684a5a..8c35c88257 100644 --- a/cmake/projects/libxml2/hunter.cmake +++ b/cmake/projects/libxml2/hunter.cmake @@ -4,71 +4,21 @@ # !!! DO NOT PLACE HEADER GUARDS HERE !!! include(hunter_add_version) -include(hunter_cmake_args) include(hunter_cacheable) -include(hunter_configuration_types) -include(hunter_pick_scheme) include(hunter_download) -include(hunter_check_toolchain_definition) - -hunter_add_version( - PACKAGE_NAME - libxml2 - VERSION - "2.9.7" - URL - "http://xmlsoft.org/sources/libxml2-2.9.7.tar.gz" - SHA1 - ab3325e6cdda50ab2382fdfe0bdb6f7d1b9224a6 -) +include(hunter_pick_scheme) hunter_add_version( PACKAGE_NAME libxml2 VERSION - "2.9.4" + "2.9.7-p0" URL - "http://xmlsoft.org/sources/libxml2-2.9.4.tar.gz" + "https://github.com/hunter-packages/libxml2/archive/v2.9.7-p0.tar.gz" SHA1 - 958ae70baf186263a4bd801a81dd5d682aedd1db -) - -set( - _libxml_unrelocatable_text_files - PACKAGE_UNRELOCATABLE_TEXT_FILES - "lib/pkgconfig/libxml-2.0.pc" - "lib/libxml2.la" - "bin/xml2-config" - "lib/xml2Conf.sh" + 5d5d6da2a87267f160f76a26c5637cbc48b28784 ) -hunter_configuration_types(libxml2 CONFIGURATION_TYPES Release) - -if (MSVC) - hunter_check_toolchain_definition(NAME "_DLL" DEFINED _hunter_vs_md) - hunter_pick_scheme(DEFAULT url_sha1_libxml2_msvc) - # pkgconfig file not applicable - set(_libxml_unrelocatable_text_files "") - hunter_cmake_args( - libxml2 - CMAKE_ARGS - LIBXML2_BUILD_DYNAMIC_VSRUNTIME=${_hunter_vs_md} - ) -else() - hunter_pick_scheme(DEFAULT url_sha1_autotools) - # Drop dependencies - hunter_cmake_args( - libxml2 - CMAKE_ARGS - EXTRA_FLAGS=--without-python --without-lzma --without-zlib --without-iconv - PKGCONFIG_EXPORT_TARGETS=libxml-2.0 - ) -endif() - +hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(libxml2) - -hunter_download( - PACKAGE_NAME libxml2 - PACKAGE_INTERNAL_DEPS_ID "11" - ${_libxml_unrelocatable_text_files} -) +hunter_download(PACKAGE_NAME libxml2) diff --git a/examples/libxml2/CMakeLists.txt b/examples/libxml2/CMakeLists.txt index 7ee3800e90..60d18be989 100644 --- a/examples/libxml2/CMakeLists.txt +++ b/examples/libxml2/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2016, Alexandre Pretyman -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.2) # Emulate HunterGate: # * https://github.com/hunter-packages/gate @@ -8,20 +8,8 @@ project(libxml2-example) # DOCUMENTATION_START { hunter_add_package(libxml2) -find_package(libxml-2.0 CONFIG REQUIRED) +find_package(libxml2 CONFIG REQUIRED) add_executable(boo main.c) -target_link_libraries(boo PRIVATE PkgConfig::libxml-2.0) +target_link_libraries(boo PRIVATE libxml2::libxml2) # DOCUMENTATION_END } - -include(CheckLibraryExists) -check_library_exists(m "pow" "" __math_system_library) -if(__math_system_library) - set_property( - TARGET - PkgConfig::libxml-2.0 - APPEND - PROPERTY - INTERFACE_LINK_LIBRARIES m - ) -endif()