Commit Graph

15 Commits

Author SHA1 Message Date
0b684fa3e9 VS2013: Override ToolsVersion setting
Otherwise those external projects will fail, because with only VS2013 installed
there is no ToolsVersion 4.0 (which is set inside the VC projects files).

http://msdn.microsoft.com/en-us/library/bb383985.aspx

Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd
2014-08-09 16:47:52 +02:00
6c4de44909 fix external/coinmp on OSX: bad symlinking
instdir/LibreOfficeDev.app/Contents/MacOS/libCbc.3.dylib -> libCbc.3.8.8.dylib
(which does not exist)

See also: 9f339a89453808b917177a3ee675a76385758902

Change-Id: I398d649c2e918b496c9b92364189da4796682653
Reviewed-on: https://gerrit.libreoffice.org/10614
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-08-07 12:53:00 +00:00
1e03324c2e Make coinmp build with VS2013
Add a patch to mangle the project files a bit so that they work better
on a machine with only VS2013 installed. At least in my case. But why
we still need to *also* have those /p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 in the ExternalProject_coinmp.mk I don't
know.

Change-Id: Ieebd729c3ba89cf22231fb943f3739d6be5c7acd
2014-07-29 20:25:19 +03:00
2729671e35 coinmp: macosx.build.patch
Fix UNAME_PROCESSOR detection in Mac OS X.

Add a filter expression before to apply a platform-specific patch.

Change-Id: I9fc4cf790f16255f4e807e070dbae0e5a1f28781
Reviewed-on: https://gerrit.libreoffice.org/10227
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-14 11:36:13 +00:00
83cfe89697 VS2013: Adjust coinmp to 12.0 vcproj version
Change-Id: I3b069278297c489b0aeb54ebef484c73dee503c0
Reviewed-on: https://gerrit.libreoffice.org/10158
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-11 11:32:21 +00:00
67b4b34cce coverity#1202902 Uncaught CoinError exception
Change-Id: I93488fa942f1975b9c32be6d37fc76ea955a2067
2014-06-06 14:56:28 +01:00
09c0a96eb3 externals: do not use "v110_xp" when building with MSVC 2012 and SDK 8.0
Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7
2014-05-26 11:39:06 +02:00
197f2016e3 fdo#77313: coinmp: error: format not a string literal and no format arguments
Change-Id: I044f12c4b7b28963d6d491d5e5850ddb59a564c4
2014-05-22 08:10:19 +02:00
63bc29b2a8 Make CoinMP build for Android
(No idea whether it works, of course.)

Patch the config.sub files to recognize arm-linux-androideabi.

Don't build any binary programs as that fails for Android becuase we don't
pass in the right C++ library to use anyway. (And those programs aren't really
useful to us anyway, on any platform, I guess?)

Change-Id: I70c7a527db41081a51548ce6983b6a9ae8a08bc7
2014-05-20 17:07:45 +03:00
dd633de592 Make CoinMP build for iOS
Change-Id: I8adff18896115d7dd0fce49916a18dc830506a36
2014-05-20 15:25:45 +03:00
e175eb3ced fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012
VS2012 did change return value of fileno function, this results in a
crash when run in GUI mode (but not when launching from a shell), as
python tries to access the nonexisting stdin/stdout/stderr
Also explicitly target Windows XP

Change-Id: Ic783713b55453f3c38b2e766a664b7f4678711de
2014-05-19 19:58:54 +02:00
cce49ccd00 Don't even dare check for Fortran
...which can lead to problems when e.g. building against a local trunk GCC
(requiring LD_LIBRARY_PATH) that was configured to build only C/C++ compilers,
so CoinMP's configuration would try to blend that with the system's gfortran.

Change-Id: I9f237df0887e06e50b9e76f3a09cfebb6f22dc20
2014-04-11 10:04:37 +02:00
cddbec75d4 Fix Windows build(external/coinmp)
This patch fixes the problem that a linker misses CoinMP.dll.
The problem will occurs when we use --enable-dbgutil option.

Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a
Reviewed-on: https://gerrit.libreoffice.org/8854
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-04-05 01:01:13 -05:00
6731f6c36f coinmp: actually link the libraries
Several people named Chris report failures in the solver unit test, and
apparently the CoinMP libraries have loads of unresolved symbols
because they don't have NEEDED entries, i.e. were not linked properly;
let's see if this fixes it.

Change-Id: Id406e14b0805a458d608c23cb7c65d873b5ba2f0
Reviewed-on: https://gerrit.libreoffice.org/8850
Reviewed-by: Chris Laplante <mostthingsweb@gmail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-04 14:29:07 -05:00
dbe6e76332 Add CoinMP external as an alternative to lpsolve.
Change-Id: I9bf5c339a34655c3b842cef3af76814a14c483bc
2014-03-03 13:35:41 +01:00