iOS, swarmsolver workaround

Due to license problems (see mail dev list) disabled swarmsolver Change-Id: I39889ddab2563a857c3bf0982244f889a402097f

iOS, swarmsolver workaround
Due to license problems (see mail dev list) disabled swarmsolver Change-Id: I39889ddab2563a857c3bf0982244f889a402097f
0ee2bd1a · jan Iversen · 0aed91c6 · 0ee2bd1a · 0ee2bd1a
Kaydet (Commit) 0ee2bd1a authored Kas 18, 2017 tarafından jan Iversen
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Rdb_services.mk postprocess/Rdb_services.mk +2 -1

Library_solver.mk sccomp/Library_solver.mk +4 -1

No files found.
--- 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 \

--- 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) \