Commit Graph

32 Commits

Author SHA1 Message Date
Corentin Le Molgat
7d7d8cdefd Bump to Protobuf 3.6.1 (Fix #838) 2018-09-10 10:15:42 +02:00
Corentin Le Molgat
bbb12746ac cmake/external: Fix typo 2018-04-17 13:06:28 +02:00
Corentin Le Molgat
3c72a9c0c4 Fix Swig URL for CMake Windows 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
eb9baf0ffa Add swig to windows only if we build python, java or csharp 2018-02-13 15:12:47 +01:00
Corentin Le Molgat
c97bb82bf9 Only add ortools as CMake subproject if target not found
Should fix error if a super build already has some
2018-02-13 15:12:47 +01:00
Corentin Le Molgat
6a9403a547 Fix glog tag so patch can apply 2018-02-12 17:22:07 +01:00
Corentin Le Molgat
66e7fba841 Fix external patch path.
When incorporating ortools in an existing CMake Project,
${CMAKE_SOURCE_DIR} will point to the wrong directory prefer to
use PROJECT_SOURCE_DIR instead...
2018-02-12 17:21:55 +01:00
Corentin Le Molgat
5a68b6e484 Add Cbc subproject to install target 2018-02-06 14:18:08 +01:00
Corentin Le Molgat
6b4264830c Enable install rules for deps 2018-02-06 14:16:37 +01:00
Corentin Le Molgat
95f4279aea Bump protobuf to 3.5.1 2018-02-06 14:16:37 +01:00
Corentin Le Molgat
5759af1a97 Move CMake gflags target to its own namespace.
Use gflags::gflags as others deps to be more consistent and modern
2018-02-06 14:16:37 +01:00
Corentin Le Molgat
6856567eda Rework CMakeLists.txt
Dependencies:
- Add dependencies as subprojects instead of prebuild (aka imported target)
- add zlib project
- Use Cbc as CMake subproject instead of prebuilt
- Add log between each subproject
- Force gflags namespace to gflags

Or-tools:
- Rework python.cmake support
- Fix missing ortool.util in python (#558)
- Try to use static library for ortools::proto
pros: can use target_link_libraries to get includes etc...
cons: lot of symbols undefined since libortools.so will strip everything -_-
- Use add_library(XXX OBJECT) for ortools/*
- fix get version from git when using small depth copy
- Create Install rule for ortools
- Don't create export rules
note: since we use subprojects instead of Imported Target,
ortools export complained against target deps "that is not in the export set."

Update windows support
- add swig project
- Protobuf force the use of /MD instead of /MT
- or-tools use /MD by default
- Add missing ws2_32
- Add missing psapi
- Update windows disable warnings list
- Build Static or-tools on Windows
- fix windows export symbols leak issue

Signed-off-by: Corentin Le Molgat <corentinl@google.com>
2018-01-19 15:03:25 +01:00
Amit Prakash Ambasta
e7c7b8a5ef Specify NMake generator for WIN32 2017-06-14 18:35:12 +05:30
Amit Prakash Ambasta
43158791f8 Change includedirs for cbc projects built internally 2017-06-14 17:30:51 +05:30
Amit Prakash Ambasta
606c31849c Rename Glog to glog in external/glog.cmake 2017-06-14 16:25:48 +05:30
Amit Prakash Ambasta
ee1de6b77b Fix merge issues in gflags cmake file 2017-06-09 18:32:48 +05:30
Amit Prakash Ambasta
2d2dc9ea7d Resolved merge conflict 2017-06-09 18:00:13 +05:30
Amit Prakash Ambasta
1d48160532 Fixes to compile glog against locally built gflags 2017-06-09 16:39:31 +05:30
Laurent Perron
6609fac882 AC all different in the SAT solver; change the way integer variables are encoded on top of boolean variables in the SAT solver; change protobuf utilities 2017-06-08 12:33:16 +02:00
Amit Prakash Ambasta
5ffd850aeb Make glog depend on gflags 2017-06-06 19:06:04 +05:30
Amit Prakash Ambasta
e833d3b90f Gflags is reflected as gflags in the project CMakeConfig 2017-06-06 19:00:30 +05:30
Amit Prakash Ambasta
c70bd86e14 Set protoc executable varaible to imported target 2017-06-06 16:19:44 +05:30
Amit Prakash Ambasta
d71b505d41 Fix protoc dependency issues 2017-06-06 16:03:34 +05:30
Amit Prakash Ambasta
90cbbf3008 Specify protoc/libprotobuf to depend on external protobuf build 2017-06-06 15:41:49 +05:30
Amit Prakash Ambasta
9042f518bd Missing property param in set_property, enable silent builds for coin 2017-06-06 15:30:57 +05:30
Amit Prakash Ambasta
d75292d759 Specify protoc binary as an imported target 2017-06-06 14:56:39 +05:30
Amit Prakash Ambasta
989db6ebdd Remove external dependencies specified manually 2017-06-06 14:54:03 +05:30
Amit Prakash Ambasta
93bc5a3e0e Separate dependency libs into their own flags, addition of imported targets. Working *nix build 2017-06-05 17:11:45 +05:30
Amit Prakash Ambasta
b98bedd906 Added missing archives from cbc and clp, added libz as libraries required to statically link against protobuf 2017-06-02 14:24:32 +05:30
Amit Prakash Ambasta
ec02b1eb2e t push -f# This is a combination of 2 commits.
Specify zlib as a system depend, disable Win builds(needs rework), move versioning to a config file
2017-06-01 17:45:11 +05:30
Amit Prakash Ambasta
9fbe3e2e33 Added cbc with fallback to locally compiled 2017-05-31 18:50:57 +05:30
Amit Prakash Ambasta
50151907e1 Enable fallback for gflags, glog and protobuf 2017-05-31 16:22:00 +05:30