diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-04 22:00:15 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-08 12:45:10 +0200 |
| commit | 3790e84ec782af2b64c286d134c728993adb3214 (patch) | |
| tree | aaf1eed94000019bf1b237bbfdd1c9e2e22b7dc9 | |
| parent | 345d0140104db238092b41af7360c538dfa576b3 (diff) | |
move this into RepositoryExternal.mk
Change-Id: I6e59fe4cd5b70b672307097f55497d09fc1161a9
| -rw-r--r-- | RepositoryExternal.mk | 8 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c99e4ea1a13f..ed0f471b91c6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1095,6 +1095,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_lcms2 +$(call gb_LinkTarget_set_include,$(1),\ + -I$(OUTDIR)/inc/lcms2 \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ lcms2 \ ) @@ -1108,6 +1112,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_lcms2 +$(call gb_LinkTarget_set_include,$(1),\ + -I$(OUTDIR)/inc/lcms2 \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_libraries,$(1),\ lcms2 \ ) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f8afea0440ce..836edb374c0a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ $(if $(filter WNTGCC,$(OS)$(COM)),-I$(OUTDIR)/inc/external/wine) \ - $(if $(filter NO,$(SYSTEM_LCMS2)),-I$(OUTDIR)/inc/lcms2) \ )) $(eval $(call gb_Library_add_defs,vcl,\ |