diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-11-03 19:19:30 -0400 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-07 22:33:48 +0000 |
| commit | 085346f80da394ad5008f40679a0d3519f7a82a3 (patch) | |
| tree | 2bce02d30a8fca7679e92bca7d6a8cc94a31dee6 /RepositoryExternal.mk | |
| parent | 74abeff02b750fb22fc3d56299abc2cd12d357d3 (diff) | |
convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Reviewed-on: https://gerrit.libreoffice.org/1002
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 12 |
1 files changed, 10 insertions, 2 deletions
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 |