diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-31 19:36:41 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-04-01 11:04:32 +0200 |
| commit | 8dc394d5c573e5583760c7cc56c5c19062d3f062 (patch) | |
| tree | 400cf8f6dbf0cfc620df46ef2ddb5d984c4f4abc /scp2 | |
| parent | 7c860af19bd8e0cf22a13e3987ec87555ebb5824 (diff) | |
Revert "Allow to build lpsolver based on CoinMP library."
This reverts commit 4f7b96886ec2e98f270a9ec3c3509cd523fce7cc.
Conflicts:
configure.ac
scp2/InstallModule_ooo.mk
Change-Id: I5621496d70a2c493eb964c1138d310c68fa6d660
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_calc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index b64ae2abac10..a4d558329e67 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -16,7 +16,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ ENABLE_MACOSX_SANDBOX \ )) -ifneq (,$(WITH_LPSOLVER)) +ifneq (,$(ENABLE_COINMP)$(ENABLE_LPSOLVE)) $(eval $(call gb_InstallModule_add_defs,scp2/calc,\ -DWITH_LPSOLVER \ )) |