Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libxml2: bump dependencies + use NMakeToolchain/NMakeDeps for msvc build #16169

Merged
merged 5 commits into from
Mar 21, 2023
Merged

libxml2: bump dependencies + use NMakeToolchain/NMakeDeps for msvc build #16169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
891f632
bump xz_utils
SpaceIm Feb 20, 2023
f9ef5de
modernize more
SpaceIm Feb 20, 2023
2a65880
fix test of custom CMake variables
SpaceIm Mar 8, 2023
c7eb39c
more robust definition of custom CMake variables
SpaceIm Mar 8, 2023
bec566e
improve LIBXML2_VERSION_STRING
SpaceIm Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 27 additions & 35 deletions recipes/libxml2/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
from conan import ConanFile
from conan.tools.env import Environment, VirtualBuildEnv, VirtualRunEnv
from conan.tools.scm import Version
from conan.tools.apple import fix_apple_shared_install_name
from conan.tools.build import cross_building, build_jobs
from conan.tools.env import VirtualBuildEnv, VirtualRunEnv
from conan.tools.files import copy, get, rename, rm, rmdir, replace_in_file, save, chdir, mkdir
from conan.tools.gnu import Autotools, AutotoolsToolchain, AutotoolsDeps, PkgConfigDeps
from conan.tools.layout import basic_layout
from conan.tools.microsoft import is_msvc, msvc_runtime_flag, unix_path, VCVars
from conan.tools.microsoft import is_msvc, msvc_runtime_flag, unix_path, NMakeDeps, NMakeToolchain
from conan.tools.scm import Version
import os

import itertools
import textwrap

required_conan_version = ">=1.53.0"
required_conan_version = ">=1.55.0"


class Libxml2Conan(ConanFile):
Expand Down Expand Up @@ -95,7 +96,7 @@ def requirements(self):
if self.options.zlib:
self.requires("zlib/1.2.13")
if self.options.lzma:
self.requires("xz_utils/5.2.5")
self.requires("xz_utils/5.4.0")
if self.options.iconv:
self.requires("libiconv/1.17", transitive_headers=True, transitive_libs=True)
if self.options.icu:
Expand All @@ -104,26 +105,22 @@ def requirements(self):
def build_requirements(self):
if not (is_msvc(self) or self._is_mingw_windows):
if self.options.zlib or self.options.lzma or self.options.icu:
self.tool_requires("pkgconf/1.9.3")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/1.9.3")
if self._settings_build.os == "Windows":
self.win_bash = True
if not self.conf.get("tools.microsoft.bash:path", check_type=str):
self.tool_requires("msys2/cci.latest")

def source(self):
get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True)
get(self, **self.conan_data["sources"][self.version], strip_root=True)

def generate(self):
if is_msvc(self):
tc = VCVars(self)
tc = NMakeToolchain(self)
tc.generate()
env = Environment()
# TODO: no conan v2 build helper for NMake yet (see https://github.com/conan-io/conan/issues/12188)
# So populate CL with AutotoolsToolchain cflags
c_flags = AutotoolsToolchain(self).cflags
if c_flags:
env.define("CL", c_flags)
env.vars(self).save_script("conanbuildenv_nmake")
deps = NMakeDeps(self)
deps.generate()
elif self._is_mingw_windows:
pass # nothing to do for mingw? it calls mingw-make directly
else:
Expand Down Expand Up @@ -277,10 +274,6 @@ def _patch_sources(self):
replace_in_file(self, os.path.join(self.source_folder, "win32", makefile),
"install-libs : all",
"install-libs :")
# relocatable shared lib on macOS
replace_in_file(self, os.path.join(self.source_folder, "configure"),
"-install_name \\$rpath/",
"-install_name @rpath/")

def build(self):
self._patch_sources()
Expand Down Expand Up @@ -333,6 +326,7 @@ def package(self):
rmdir(self, os.path.join(self.package_folder, "share"))
rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
fix_apple_shared_install_name(self)

for header in ["win32config.h", "wsockcompat.h"]:
copy(self, pattern=header, src=os.path.join(self.source_folder, "include"),
Expand All @@ -344,33 +338,31 @@ def package(self):

def _create_cmake_module_variables(self, module_file):
# FIXME: also define LIBXML2_XMLLINT_EXECUTABLE variable
content = textwrap.dedent("""\
content = textwrap.dedent(f"""\
set(LibXml2_FOUND TRUE)
set(LIBXML2_FOUND TRUE)
if(DEFINED LibXml2_INCLUDE_DIRS)
set(LIBXML2_INCLUDE_DIR ${LibXml2_INCLUDE_DIRS})
set(LIBXML2_INCLUDE_DIRS ${LibXml2_INCLUDE_DIRS})
set(LIBXML2_INCLUDE_DIR ${{LibXml2_INCLUDE_DIRS}})
set(LIBXML2_INCLUDE_DIRS ${{LibXml2_INCLUDE_DIRS}})
elseif(DEFINED libxml2_INCLUDE_DIRS)
set(LIBXML2_LIBRARIES ${libxml2_INCLUDE_DIRS})
set(LIBXML2_LIBRARY ${libxml2_INCLUDE_DIRS})
set(LIBXML2_LIBRARIES ${{libxml2_INCLUDE_DIRS}})
set(LIBXML2_LIBRARY ${{libxml2_INCLUDE_DIRS}})
endif()
if(DEFINED LibXml2_LIBRARIES)
set(LIBXML2_LIBRARIES ${LibXml2_LIBRARIES})
set(LIBXML2_LIBRARY ${LibXml2_LIBRARIES})
set(LIBXML2_LIBRARIES ${{LibXml2_LIBRARIES}})
set(LIBXML2_LIBRARY ${{LibXml2_LIBRARIES}})
elseif(DEFINED libxml2_LIBRARIES)
set(LIBXML2_LIBRARIES ${libxml2_LIBRARIES})
set(LIBXML2_LIBRARY ${libxml2_LIBRARIES})
set(LIBXML2_LIBRARIES ${{libxml2_LIBRARIES}})
set(LIBXML2_LIBRARY ${{libxml2_LIBRARIES}})
endif()
if(DEFINED LibXml2_DEFINITIONS)
set(LIBXML2_DEFINITIONS ${LibXml2_DEFINITIONS})
set(LIBXML2_DEFINITIONS ${{LibXml2_DEFINITIONS}})
elseif(DEFINED libxml2_DEFINITIONS)
set(LIBXML2_DEFINITIONS ${libxml2_DEFINITIONS})
endif()
if(DEFINED LibXml2_VERSION)
set(LIBXML2_VERSION_STRING ${LibXml2_VERSION})
elseif(DEFINED libxml2_VERSION)
set(LIBXML2_VERSION_STRING ${libxml2_VERSION})
set(LIBXML2_DEFINITIONS ${{libxml2_DEFINITIONS}})
else()
set(LIBXML2_DEFINITIONS "")
endif()
set(LIBXML2_VERSION_STRING "{self.version}")
""")
save(self, module_file, content)

Expand Down
2 changes: 1 addition & 1 deletion recipes/libxml2/all/test_cmake_module_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(_custom_vars
LIBXML2_VERSION_STRING
)
foreach(_custom_var ${_custom_vars})
if(DEFINED _custom_var)
if(DEFINED ${_custom_var})
message(STATUS "${_custom_var}: ${${_custom_var}}")
else()
message(FATAL_ERROR "${_custom_var} not defined")
Expand Down