diff options
| -rw-r--r-- | RepositoryExternal.mk | 12 | ||||
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 73dbbd83e459..34e1d9d55046 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -909,7 +909,7 @@ endif # SYSTEM_GRAPHITE ifeq ($(SYSTEM_ICU),YES) gb_LinkTarget__use_icu_headers:= -gb_ExternalProject__use_icu_headers:= +gb_ExternalProject__use_icu:= define gb_LinkTarget__use_icudata $(call gb_LinkTarget_add_libs,$(1),-licudata) @@ -951,14 +951,8 @@ $(call gb_LinkTarget_set_include,$(1),\ endef -define gb_ExternalProject__use_icu_headers -$(call gb_ExternalProject_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,icu) -$(call gb_ExternalProject_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,icu)/source \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - $$(INCLUDE) \ -) +define gb_ExternalProject__use_icu +$(call gb_ExternalProject_use_package,$(1),icu) endef diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index f2970262b8d6..7bc737701862 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ )) $(eval $(call gb_ExternalProject_use_externals,libcdr,\ - icu_headers \ + icu \ lcms2 \ wpd \ wpg \ |