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 /RepositoryExternal.mk | |
| 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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0a70e2675062..150e289d27f4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1982,7 +1982,7 @@ endef endif # ANDROID endif # SYSTEM_LCMS2 -ifeq ($(WITH_LPSOLVER),lpsolve) +ifneq ($(ENABLE_LPSOLVE),) ifneq ($(SYSTEM_LPSOLVE),) @@ -2020,7 +2020,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ endif # SYSTEM_LPSOLVE -else ifeq ($(WITH_LPSOLVER),coinmp) +endif # ENABLE_LPSOLVE + +ifneq ($(ENABLE_COINMP),) define gb_LinkTarget__use_coinmp $(call gb_LinkTarget_use_package,$(1),coinmp) @@ -2050,7 +2052,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ coinmp \ )) -endif # WITH_LPSOLVER +endif # ENABLE_COINMP ifeq ($(ENABLE_GIO),TRUE) |