Install coinmp and lpsolve linear solvers in parallel.

(cherry picked from commit de7cdbc5840fd7d958d486901e405890eff224b9)
+ some amending

Conflicts:
Repository.mk
config_host.mk.in

Change-Id: If07d94a2f646c8377b76fdf645e85f9491e4f061

5 files changed, 50 insertions, 7 deletions

diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
index bb3b137dbed2..9b4060edbaa7 100644
--- a/scp2/InstallModule_calc.mk
+++ b/scp2/InstallModule_calc.mk
@@ -12,12 +12,18 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/calc))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
-	ENABLE_LPSOLVE \
 	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
 	ENABLE_MACOSX_SANDBOX \
-	SYSTEM_LPSOLVE \
 ))
 
+ifneq (,$(ENABLE_COINMP)$(ENABLE_LPSOLVE))
+$(eval $(call gb_InstallModule_add_defs,scp2/calc,\
+	-DWITH_LPSOLVER \
+	$(if $(filter TRUE,$(ENABLE_COINMP)),-DCOINMP_LPSOLVER) \
+	$(if $(filter TRUE-NO,$(ENABLE_LPSOLVE)-$(SYSTEM_LPSOLVE)),-DLPSOLVE_LPSOLVER) \
+))
+endif
+
 $(eval $(call gb_InstallModule_add_templates,scp2/calc,\
     scp2/source/templates/module_langpack_calc \
 ))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 4d4e33d0557b..23705bfd74b3 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_KDE \
 	ENABLE_KDE4 \
 	ENABLE_LIBLANGTAG \
-	ENABLE_LPSOLVE \
 	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
 	ENABLE_MACOSX_SANDBOX \
 	ENABLE_NPAPI_FROM_BROWSER \
@@ -60,7 +59,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_LIBLANGTAG \
 	SYSTEM_LIBXML \
 	SYSTEM_LIBXSLT \
-	SYSTEM_LPSOLVE \
 	SYSTEM_LUCENE \
 	SYSTEM_MYTHES \
 	SYSTEM_NEON \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d55c304a0393..6bab84d2e4cd 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -72,6 +72,7 @@
     #define EXENAME(name)                     STRING(CONCAT2(name,.exe))
     #define PROFILENAME(name)                 STRING(CONCAT2(name,.ini))
     #define SPECIAL_NAME(name)                STRING(CONCAT2(name,.dll))
+    #define SPECIAL_NAME_VER(name,version)    SPECIAL_NAME(name)
     #define SPECIAL_COMPONENT_LIB_NAME(name)  STRING(CONCAT2(name,.dll))
 #endif
 
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 171459ed4ed0..4bdde9436512 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -50,15 +50,52 @@ File gid_File_Exe_Scalc
 End
 #endif
 
-#if defined(ENABLE_LPSOLVE)
-
+#if defined(WITH_LPSOLVER)
 STD_RES_FILE( gid_File_Res_Solver, solver)
+#endif
 
-#if ! defined (SYSTEM_LPSOLVE)
+#if defined(LPSOLVE_LPSOLVER)
 File gid_File_Lib_Lpsolve
     PACKED_LIB_FILE_BODY;
     Name = SPECIAL_NAME(lpsolve55);
 End
 #endif
 
+#if defined(COINMP_LPSOLVER)
+File gid_File_Lib_CoinMP
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(CoinMP,1);
+End
+
+#if !defined WNT
+File gid_File_Lib_Cbc
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(Cbc,3);
+End
+File gid_File_Lib_CbcSolver
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(CbcSolver,3);
+End
+File gid_File_Lib_Cgl
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(Cgl,1);
+End
+File gid_File_Lib_Clp
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(Clp,1);
+End
+File gid_File_Lib_OsiClp
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(OsiClp,1);
+End
+File gid_File_Lib_CoinUtils
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(CoinUtils,3);
+End
+File gid_File_Lib_Osi
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(Osi,1);
+End
+#endif
+
 #endif
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 020af524d81a..d2a2faa5e914 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -37,6 +37,7 @@ Module gid_Module_Prg_Calc_Bin
     Styles = (HIDDEN_ROOT);
     Files = (auto_calc_ALL,
     gid_File_Share_Registry_Calc_Xcd,
+    gid_File_Lib_Cbc,gid_File_Lib_CbcSolver,gid_File_Lib_Cgl,gid_File_Lib_Clp,gid_File_Lib_OsiClp,gid_File_Lib_CoinMP,gid_File_Lib_CoinUtils,gid_File_Lib_Osi,
     gid_File_Lib_Lpsolve);
 End