always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,873 Commits 2 Branches 0 Tags
ac42c57a8eb1094dea6dc476592ad04dc4e0aa45
Commit Graph

68 Commits

Author SHA1 Message Date
Corentin Le Molgat
2debe09e43 CMake cleanup 2018-10-12 09:48:12 +02:00
Corentin Le Molgat
4156f03933 utils.cmake fix version retrieval 2018-10-12 09:48:12 +02:00
Corentin Le Molgat
7d7d8cdefd Bump to Protobuf 3.6.1 (Fix #838) 2018-09-10 10:15:42 +02:00
Corentin Le Molgat
42d7c276ab dotnet: rework example layout 
- Fix examples using MPConstraint::Activity instead of MPSolver
- Move all examples to exmaples/dotnet
- remove netfx sub-directories
- Add all examples to target test_dotnet
  - still few disabled since they are too long
- Add tools/generate_examples_csproj.sh to generate .*proj files
 2018-08-30 11:58:47 +02:00
Corentin Le Molgat
ed47e1f70d CMake: copy libortools to .libs in pyhon package 2018-08-16 15:59:11 +02:00
Laurent Perron
b5b8a34e10 fix cmake 2018-07-25 11:43:29 -07:00
Corentin Le Molgat
99d4d0ad54 Support python 3.7 on MacOS 
- MacOS brew just bump to python 3.7
- Bump make 3.81 -> 4.2.1 on MacOS Travis CI
- Ubuntu CI use python3.6
 2018-07-03 09:56:07 +02:00
Corentin Le Molgat
3043efa437 CMake: Add missing __WIN32__ 2018-06-29 09:31:52 +02:00
Corentin Le Molgat
9e07fd6985 Fix CMake proto_path 2018-04-19 16:27:51 +02:00
Corentin Le Molgat
bbb12746ac cmake/external: Fix typo 2018-04-17 13:06:28 +02:00
Corentin Le Molgat
ad825e4096 CMake: fix wheel platlib/purelib missmatch (Fix #618) 2018-03-26 11:49:55 +02:00
Corentin Le Molgat
658ad5210e CMake: install missing package in user 
- will avoid permission issue
 2018-03-26 11:49:55 +02:00
Corentin Le Molgat
3c72a9c0c4 Fix Swig URL for CMake Windows 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
21ca5aa5e2 Update Readme 2018-02-21 14:20:47 +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
de4e5b3e5e Update CMake UT using Docker 2018-02-09 17:40:40 +01:00
Corentin Le Molgat
27b3b195c7 Update CMake/Makefile 2018-02-07 12:56:55 +01:00
Corentin Le Molgat
a538af550e Add cmake/Makefile to test cmake build and install 
- This makefile orchestrate the use of cmake/docker to test cmake
- add cache/ to .gitignore
 2018-02-06 14:20:09 +01:00
Corentin Le Molgat
083da57bf3 Fix ortools cbc:: namespace use for target dependencies 2018-02-06 14:18:08 +01:00
Corentin Le Molgat
50b9146721 Remove cmake dead file 
not in use anymore
 2018-02-06 14:18:08 +01:00
Corentin Le Molgat
2d4f9cccdb Move ortoolsConfig.cmake.in in cmake dir. 
- remove duplicate
 2018-02-06 14:18:08 +01:00
Corentin Le Molgat
6a9584794a Update export to ortoolsTargets.cmake 
- Use export in Cbc (master)
- Patch Protobuf to work
- Remove glog patch which disable install(export ...)
 2018-02-06 14:18:08 +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
4a73379bf2 use target_compile_features() 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
9a8e8fb6be search python module, and install it if needed 2018-02-06 14:16:37 +01:00
Corentin Le Molgat
a5542dc5cc Python unix wrapper only depend on ortools soname 2018-01-22 16:56:21 +01:00
Corentin Le Molgat
eea490583d Only create test if virtualenv module found 2018-01-22 16:55:40 +01:00
Corentin Le Molgat
8b222ebec2 Only create wheel package if wheel module found 2018-01-22 16:55:15 +01:00
Corentin Le Molgat
8bd5acee1a Add Test & Examples 
Tests:
- Add cc test
- Add python test

Examples:
- Add examples/cpp
- Add examples/data
- Add examples/notebook
- Add examples/python

Signed-off-by: Corentin Le Molgat <corentinl@google.com>
 2018-01-19 15:03:25 +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
Laurent Perron
33314b1869 cleanup sat code after change to allow linear objective 2017-07-05 16:27:00 -07:00
Amit Prakash Ambasta
b11536c04f Hardcoded include paths for python setup.py for now 2017-07-03 18:29:44 +05:30
Amit Prakash Ambasta
0737f36cc4 Do not invoke setup.py build module via cmake but just build the src tarball for python, added manifest to ship additional swig include files 2017-07-03 17:57:58 +05:30
Amit Prakash Ambasta
91557b58db Incorrect naming for output var for git in utils 2017-07-03 16:16:20 +05:30
Amit Prakash Ambasta
31863e4dda Added flags to force rebuild of all dependencies, created hierarchy b/w python and C++ projects when the C++ project is being built 2017-07-03 15:42:24 +05:30
Amit Prakash Ambasta
c5c1d3d56f Added version detection support from git tags with fallback to file, added ability to generate cmake config files 2017-07-03 15:30:25 +05:30
Amit Prakash Ambasta
341fb1c98a Added __init__.py missing in ortools python subdirs 2017-06-28 16:17:25 +05:30
Amit Prakash Ambasta
97d581dd9e Added support to build python 2017-06-28 15:45:56 +05:30
Amit Prakash Ambasta
e7c7b8a5ef Specify NMake generator for WIN32 2017-06-14 18:35:12 +05:30
Amit Prakash Ambasta
efeee95364 FindCbc should append includedirs for all the subprojects cbc depends on as well 2017-06-14 17:51:38 +05:30
Amit Prakash Ambasta
415906d5bc Detect path suffix cbc/coin/CbcConfig.h for alternate installations 2017-06-14 17:35:27 +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
63febfa0aa CMake modules for Cbc/glog to avoid pkg-config on WIN32 2017-06-14 15:06:43 +05:30