diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-11-18 13:16:31 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-11-18 16:12:05 +0100 |
| commit | 0ee2bd1aeb86048f54b607d1453bd6f2685eb8a8 (patch) | |
| tree | beea5c0dda3bac80175e5f2e5d95206d619b3b5a | |
| parent | Update LibreOffice.natvis (diff) | |
| download | core-0ee2bd1aeb86048f54b607d1453bd6f2685eb8a8.tar.gz core-0ee2bd1aeb86048f54b607d1453bd6f2685eb8a8.zip | |
iOS, swarmsolver workaround
Due to license problems (see mail dev list) disabled swarmsolver
Change-Id: I39889ddab2563a857c3bf0982244f889a402097f
| -rw-r--r-- | postprocess/Rdb_services.mk | 3 | ||||
| -rw-r--r-- | sccomp/Library_solver.mk | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index d83b30819ccd..e4bc74455dda 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -118,7 +118,8 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_LPSOLVE), \ sccomp/source/solver/lpsolvesolver \ ) \ - sccomp/source/solver/swarmsolver \ + $(if $(filter-out $(OS),IOS), \ + sccomp/source/solver/swarmsolver) \ writerfilter/util/writerfilter \ writerperfect/source/draw/wpftdraw \ writerperfect/source/impress/wpftimpress \ diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index e23ecac7a5bb..178eb35bee07 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -22,7 +22,9 @@ $(eval $(call gb_Library_Library,solver)) $(if $(ENABLE_COINMP),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/coinmpsolver))) $(if $(ENABLE_LPSOLVE),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/lpsolvesolver))) +ifneq ($(OS),IOS) $(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/swarmsolver)) +endif $(eval $(call gb_Library_use_sdk_api,solver)) @@ -47,7 +49,8 @@ $(eval $(call gb_Library_use_externals,solver,\ )) $(eval $(call gb_Library_add_exception_objects,solver,\ - sccomp/source/solver/SwarmSolver \ + $(if $(filter-out $(OS),IOS), \ + sccomp/source/solver/SwarmSolver) \ sccomp/source/solver/SolverComponent \ $(if $(ENABLE_COINMP), sccomp/source/solver/CoinMPSolver) \ $(if $(ENABLE_LPSOLVE), sccomp/source/solver/LpsolveSolver) \ |