Commit Graph

12 Commits

Author SHA1 Message Date
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