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 /sccomp | |
| 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 'sccomp')
| -rw-r--r-- | sccomp/Library_solver.mk | 10 | ||||
| -rw-r--r-- | sccomp/Module_sccomp.mk | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index c5531059bc79..e1b2ca3fdfeb 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -35,19 +35,11 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(eval $(call gb_Library_use_externals,solver,\ boost_headers \ - $(WITH_LPSOLVER) \ + lpsolve \ )) -ifeq ($(WITH_LPSOLVER),lpsolve) $(eval $(call gb_Library_add_exception_objects,solver,\ sccomp/source/solver/solver-lpsolve \ )) -else ifeq ($(WITH_LPSOLVER),coinmp) -$(eval $(call gb_Library_add_exception_objects,solver,\ - sccomp/source/solver/solver \ -)) - -endif - # vim: set noet sw=4 ts=4: diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk index d250e3b574de..dd56f872ecac 100644 --- a/sccomp/Module_sccomp.mk +++ b/sccomp/Module_sccomp.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Module_Module,sccomp)) -ifneq ($(WITH_LPSOLVER),) +ifeq ($(ENABLE_LPSOLVE),TRUE) $(eval $(call gb_Module_add_targets,sccomp,\ Library_solver \ |