diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-27 17:08:09 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-03 13:35:42 +0100 |
| commit | 083fa76745d0c8cb095d856df633866c117b0f3a (patch) | |
| tree | 6f985471022c95556b9f10b967f10c780dc3065b | |
| parent | 230309c541ff9a8683e5ef749cf2f6512ad0d9df (diff) | |
fdo#60924: Autoinstall lpsolve package.
Change-Id: I1404cfc08cd03cff000b088a305e47c96df0b986
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | scp2/InstallModule_calc.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/calc/file_calc.scp | 7 |
4 files changed, 6 insertions, 9 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1133bb9e274b..8931fa6d7ce9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1859,6 +1859,7 @@ endif # ANDROID endif # SYSTEM_LCMS2 +ifneq ($(ENABLE_LPSOLVE),) ifneq ($(SYSTEM_LPSOLVE),) define gb_LinkTarget__use_lpsolve @@ -1889,7 +1890,12 @@ $(call gb_LinkTarget_set_include,$(1),\ endef +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + lpsolve \ +)) + endif # SYSTEM_LPSOLVE +endif # ENABLE_LPSOLVE ifeq ($(ENABLE_GIO),TRUE) diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index bb3b137dbed2..2c41acd8b028 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -15,7 +15,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ ENABLE_LPSOLVE \ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ ENABLE_MACOSX_SANDBOX \ - SYSTEM_LPSOLVE \ )) $(eval $(call gb_InstallModule_add_templates,scp2/calc,\ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 68ae1aad9593..5f149c3a0c2a 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -50,7 +50,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_LIBLANGTAG \ SYSTEM_LIBXML \ SYSTEM_LIBXSLT \ - SYSTEM_LPSOLVE \ SYSTEM_LUCENE \ SYSTEM_MYTHES \ SYSTEM_NEON \ diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 171459ed4ed0..371a08ff1030 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -54,11 +54,4 @@ End STD_RES_FILE( gid_File_Res_Solver, solver) -#if ! defined (SYSTEM_LPSOLVE) -File gid_File_Lib_Lpsolve - PACKED_LIB_FILE_BODY; - Name = SPECIAL_NAME(lpsolve55); -End -#endif - #endif |