Commit Graph

27 Commits

Author SHA1 Message Date
Corentin Le Molgat
9814de8263 CMake: Coin-OR is optional 2020-02-07 10:50:12 +01:00
Corentin Le Molgat
1f4f572031 CMake: Fix compilation on windows 2020-02-07 07:58:01 +01:00
Corentin Le Molgat
90c1deefbe CMake: Install dependencies built 2020-01-30 16:51:13 +01:00
Corentin Le Molgat
96b582b64f CMake: prefer to search for config.cmake before looking for modules 2020-01-30 16:51:13 +01:00
Corentin Le Molgat
6833c97426 CMake: Refactor cpp.cmake 2020-01-30 08:49:05 +01:00
Corentin Le Molgat
07768997b3 CMake: Rework CPLEX/SCIP/XPRESS management 2020-01-29 17:35:18 +01:00
Corentin Le Molgat
3594d74d39 ZLIB patch
rename target ZLIB so install target will be ZLIB::ZLIB like the name use
by the cmake FindZLIB.cmake module...
2020-01-21 17:45:31 +01:00
Corentin Le Molgat
874bda0e24 CMake: expand tab 2020-01-21 16:41:11 +01:00
Corentin Le Molgat
889deaac94 CMake: use ZLIB static when building it 2020-01-21 16:40:59 +01:00
Mizux Seiha
c2be14f23a CMake add missing abseil::random_random deps 2019-11-22 22:49:12 +01:00
Corentin Le Molgat
a49b9143a4 Rework CMake dependencies management (Fix #1116)
- By default don't build dependencies simply call find_package()
- By default only build C++ library
- IF building Python, Java or .Net wrapper then force build dependencies
  - Build dependencies as STATIC
  - Build and Install (in CMAKE_BINARY_DIR) dependencies at configure time
2019-04-11 13:47:05 +02:00
Corentin Le Molgat
9bbe0a71dd Bump Abseil-cpp to SHA1 93d155b (Fix #1074) 2019-02-22 14:46:52 +01:00
Corentin Le Molgat
b027e57e95 dotnet: Remove reference to dotnet release command
- Currently not implemented...

Add abseil patch

- Add patches/absl-config.cmake

Makefile: Add abseil-cpp on unix

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

Makefile: Add abseil-cpp on windows

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

CMake: Add abseil-cpp

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

port to absl: C++ Part

- Fix warning with the use of ABSL_MUST_USE_RESULT
  > The macro must appear as the very first part of a function
    declaration or definition:
    ...
    Note: past advice was to place the macro after the argument list.
  src: dependencies/sources/abseil-cpp-master/absl/base/attributes.h:418
- Rename enum after windows clash
- Remove non compact table constraints
- Change index type from int64 to int in routing library
- Fix file_nonport compilation on windows
- Fix another naming conflict with windows (NO_ERROR is a macro)
- Cleanup hash containers; work on sat internals
- Add optional_boolean sub-proto

Sync cpp examples with internal code
- reenable issue173 after reducing number of loops

port to absl: Python Part

- Add back cp_model.INT32_MIN|MAX for examples

Update Python examples

- Add random_tsp.py
- Run words_square example
- Run magic_square in python tests

port to absl: Java Part

- Fix compilation of the new routing parameters in java
- Protect some code from SWIG parsing

Update Java Examples

port to absl: .Net Part

Update .Net examples

work on sat internals; Add C++ CP-SAT CpModelBuilder API; update sample code and recipes to use the new API; sync with internal code

Remove VS 2015 in Appveyor-CI

- abseil-cpp does not support VS 2015...

improve tables

upgrade C++ sat examples to use the new API; work on sat internals

update license dates

rewrite jobshop_ft06_distance.py to use the CP-SAT solver

rename last example

revert last commit

more work on SAT internals

fix
2018-11-30 14:48:55 +01:00
Corentin Le Molgat
b88298edd3 Remove tab from CMakeLists.txt
- Mandatory to follow google internal convention
2018-11-13 09:21:53 +01:00
Corentin Le Molgat
2debe09e43 CMake cleanup 2018-10-12 09:48:12 +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
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
083da57bf3 Fix ortools cbc:: namespace use for target dependencies 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
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
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
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
97d581dd9e Added support to build python 2017-06-28 15:45:56 +05:30