diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-04 15:23:23 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-04 15:23:51 -0600 |
| commit | faef2e51d0c7b74334a11400b205daf382805780 (patch) | |
| tree | 8324ebfc11e6e7cd8cd7d81ea29a1511b09760f0 /RepositoryExternal.mk | |
| parent | 94a6776e2ae4e61bc58081ff6d734890f1458c5a (diff) | |
fix some lcms2 gbuildification breakages...
Change-Id: Icad3132c1710c62559c35964fe5ce3f466646f13
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5db629bc9cf3..bbf352f31195 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -878,7 +878,6 @@ gb_LinkTarget__use_graphite := endif # SYSTEM_GRAPHITE - ifeq ($(SYSTEM_ICU),YES) define gb_LinkTarget__use_icudata @@ -910,7 +909,7 @@ else gb_ICU_suffix:= endif -# icudata and icui18n is called icudt and icuin when built with MSVC :-( +# icudata and icui18n is called icudt and icuin when built with MSVC :-/ ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudt \ @@ -1219,7 +1218,7 @@ ifeq ($(SYSTEM_LCMS2),YES) define gb_LinkTarget__use_lcms2 $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(LCMS2_CFLAGS) \ + $(LCMS2_CFLAGS) \ ) $(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) @@ -1257,9 +1256,12 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - lcms2 \ -) +$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) + +endef + +define gb_ExternalProject__use_lcms2 +$(call gb_ExternalProject_use_package,$(1),lcms2) endef |