always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,310 Commits 2 Branches 0 Tags
6790dca5b8acd5102d74bfbb929c39cc83eca37f
Commit Graph

4310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Perron
6790dca5b8 presolve cumulative to disjunctive or all_different if possible 2017-06-11 20:38:22 +02:00
Laurent Perron
836e75ad48 Merge branch 'master' of https://github.com/google/or-tools 2017-06-09 14:24:46 +00:00
Laurent Perron
c6c4410f61 fix flatzinc on vs 2017 2017-06-09 14:24:19 +00:00
lperron
74a2269546 Merge pull request #413 from ambasta/master 
Move #include<coin/header> to #include<header>, fixes wrt merge issues
 2017-06-09 15:59:36 +02:00
Laurent Perron
425a49e119 regenerate makefile.gen.mk 2017-06-09 15:40:05 +02:00
Laurent Perron
ac4c36ac1e regenerate makefile.gen.mk 2017-06-09 15:39:12 +02:00
Laurent Perron
22cc9ccaa6 fix VS_RELEASE on visual studio 2017 2017-06-09 13:29:06 +00:00
Amit Prakash Ambasta
28d7528e29 Change include dirs in makefiles.plat.mk for #include <coin/header> to change to #include <header> 2017-06-09 18:50:07 +05:30
Laurent Perron
79182f1db4 support visual studio 2017 2017-06-09 13:17:02 +00:00
Amit Prakash Ambasta
ee1de6b77b Fix merge issues in gflags cmake file 2017-06-09 18:32:48 +05:30
Amit Prakash Ambasta
744d507ccb Remove coin from include prefix 2017-06-09 18:23:47 +05:30
lperron
02e1978692 Merge pull request #412 from ambasta/master 
PR to handle CMake issues wrt OSX, enforce glog to be built against gflags
 2017-06-09 14:43:18 +02:00
Amit Prakash Ambasta
7668bfa183 Merge branch 'google-master' 2017-06-09 18:00:25 +05:30
Amit Prakash Ambasta
2d2dc9ea7d Resolved merge conflict 2017-06-09 18:00:13 +05:30
Laurent Perron
a66edd4dc5 fix win build 2017-06-09 12:17:30 +00:00
Amit Prakash Ambasta
eb416b850e Patch glog for invalid includedir argument 2017-06-09 17:31:09 +05:30
Laurent Perron
c413dff750 better cmake config for glog in make third_party on unix 2017-06-09 13:32:06 +02:00
Amit Prakash Ambasta
1d48160532 Fixes to compile glog against locally built gflags 2017-06-09 16:39:31 +05:30
Laurent Perron
5f23b5ff7c fix bazel build 2017-06-08 17:02:07 +02:00
Laurent Perron
139c19aa14 Merge branch 'master' of https://github.com/google/or-tools 2017-06-08 16:37:44 +02:00
Laurent Perron
61b6de1bd1 StringPiece -> string_view 2017-06-08 16:37:22 +02:00
furnon
2c61433fc3 Fix issue in MakeRelocateNeighborsOperator 2017-06-08 12:26:05 +00:00
Laurent Perron
ce771a90aa fix bazel build 2017-06-08 12:48:45 +02:00
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
Laurent Perron
382d9939b3 Move versioning to a stand alone file 2017-06-07 10:26:41 +02:00
Laurent Perron
8c30745d5a Move versioning to a stand alone file 2017-06-07 10:26:05 +02:00
Laurent Perron
c1e3c7d951 fix cmake on mac; add some logging when running cmake 2017-06-07 09:54:01 +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
lperron
d683bc3d58 Merge pull request #407 from ambasta/master 
Build issue fixes
 2017-06-06 14:05:45 +02:00
Amit Prakash Ambasta
637b7df6ef Specify Cbc as a hard dep before building ortools 2017-06-06 16:42:16 +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
lperron
f3864a06ba Merge pull request #405 from ambasta/master 
Ignore redundant dependencies, specify target for protoc binary
 2017-06-06 11:52:11 +02:00
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
lperron
5b01e1883c Merge pull request #404 from ambasta/master 
Link examples shared libs against libortools for valid builds on OSx
 2017-06-06 10:48:10 +02:00
Amit Prakash Ambasta
9d811b8ff7 Link examples shared libs against libortools for valid builds on OSx 2017-06-06 14:13:44 +05:30
lperron
3dbe15221a Merge pull request #398 from ambasta/master 
Improvements to CMake Build Structure
 2017-06-05 17:43:39 +02:00
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
Laurent Perron
b151bbea23 fix windows make third_party 2017-06-02 16:36:39 +00:00
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
Laurent Perron
b126eac757 fix bazel 2017-06-01 19:23:34 +02:00
Laurent Perron
cbd8ba8641 introduce array slices and use them in sat 2017-06-01 16:28:29 +02:00
Laurent Perron
f4c5942c79 more work on cmake integration; allow custom swig binary on unix 2017-06-01 14:23:17 +02:00
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
Laurent Perron
88bf683de0 fix make install_python_modules 2017-06-01 00:39:58 +02:00
Laurent Perron
0378cc3eae misc fixes: mac min version is now 10.9; compile cbc with -j 4 on unix; delete glog in clean_third_party 2017-05-31 18:58:47 +02:00