From 085346f80da394ad5008f40679a0d3519f7a82a3 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 3 Nov 2012 19:19:30 -0400 Subject: convert lpsolve to gbuild Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680 Reviewed-on: https://gerrit.libreoffice.org/1002 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- RepositoryExternal.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'RepositoryExternal.mk') diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 915996246132..120dd657be71 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1232,8 +1232,11 @@ endif # SYSTEM_LCMS2 ifeq ($(SYSTEM_LPSOLVE),YES) -define gb_LinkTarget__use_lpsolve55 +define gb_LinkTarget__use_lpsolve $(call gb_LinkTarget_add_libs,$(1),-llpsolve55) +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_LPSOLVE \ +)) endef @@ -1243,10 +1246,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ lpsolve55 \ )) -define gb_LinkTarget__use_lpsolve55 +define gb_LinkTarget__use_lpsolve +$(call gb_LinkTarget_use_unpacked,$(1),lpsolve) $(call gb_LinkTarget_use_libraries,$(1),\ lpsolve55 \ ) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,lpsolve) \ + $$(INCLUDE) \ +) endef -- cgit