diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-28 10:39:19 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-03 13:35:43 +0100 |
| commit | 4f7b96886ec2e98f270a9ec3c3509cd523fce7cc (patch) | |
| tree | f98576d9ae0ea90a37a2619937790d4a10f0698e /sccomp | |
| parent | 083fa76745d0c8cb095d856df633866c117b0f3a (diff) | |
Allow to build lpsolver based on CoinMP library.
Change-Id: I0a3b2bd6744f6ccca0017cd1e06a4018f085445a
Diffstat (limited to 'sccomp')
| -rw-r--r-- | sccomp/Library_solver.mk | 10 | ||||
| -rw-r--r-- | sccomp/Module_sccomp.mk | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index e1b2ca3fdfeb..c5531059bc79 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -35,11 +35,19 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(eval $(call gb_Library_use_externals,solver,\ boost_headers \ - lpsolve \ + $(WITH_LPSOLVER) \ )) +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 dd56f872ecac..d250e3b574de 100644 --- a/sccomp/Module_sccomp.mk +++ b/sccomp/Module_sccomp.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Module_Module,sccomp)) -ifeq ($(ENABLE_LPSOLVE),TRUE) +ifneq ($(WITH_LPSOLVER),) $(eval $(call gb_Module_add_targets,sccomp,\ Library_solver \ |