diff options
| author | David Tardon <dtardon@redhat.com> | 2014-07-17 17:27:05 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-07-20 10:15:25 +0200 |
| commit | 7515b1a90fac9e31733c0fdcc1156adadf0e6f99 (patch) | |
| tree | 442bc11d06390d5ba90c773def726164b31eaa0d /RepositoryExternal.mk | |
| parent | cbc50c90ad63f0e59b8cf3bbfb6b5b1f61db09b9 (diff) | |
fdo#63756 build libxml2 with ICU support
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b0747f18cb0b..8a2ab1f0d546 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -915,23 +915,25 @@ define gb_LinkTarget__use_libxml2 $(call gb_LinkTarget_use_package,$(1),xml2) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(call gb_UnpackedTarball_get_dir,xml2)/include \ + $(LIBXML_CFLAGS) \ ) -ifeq ($(COM),MSC) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc/libxml2.lib \ -) -else $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2 \ + $(LIBXML_LIBS) \ ) + +ifeq ($(COM),MSC) +$(call gb_LinkTarget_use_external,$(1),icu_headers) endif endef define gb_ExternalProject__use_libxml2 $(call gb_ExternalProject_use_package,$(1),xml2) +ifeq ($(COM),MSC) +$(call gb_ExternalProject_use_external_project,$(1),icu) +endif + endef endif # SYSTEM_LIBXML |