Dane Springmeyer
6067fdf27f
tell mason.cmake where the mason command is
2016-10-28 12:34:34 -07:00
Dane Springmeyer
87d09f78e6
make adjustments based on PR review from @themarex
2016-10-28 12:18:13 -07:00
Dane Springmeyer
83b7d75121
Add support for building against mason-provided deps
2016-10-27 23:26:33 -07:00
Dane Springmeyer
4598599f52
# This is a combination of 4 commits.
...
# The first commit's message is:
Add support for building against mason-provided deps
# This is the 2nd commit message:
back to just one travis job: linux/release
# This is the 3rd commit message:
remove pkg-config debugging [skip ci]
# This is the 4th commit message:
use clang++ 3.8.1 for mason builds since 3.8 is what we have been using
2016-10-27 23:26:33 -07:00
Daniel Patterson
da77edfc83
Explicitly set minimum OSX version, and detect SDK path.
...
This fixes situations where XCode is installed with a newer SDK than the current OS. (#3198 )
2016-10-27 16:29:27 -06:00
Dane Springmeyer
293856981f
add -l to rt and gcov
2016-10-24 17:09:03 -07:00
Dane Springmeyer
502d9e10c2
cmake fixes:
...
- Builds up ENGINE_LIBRARY_LISTING correctly to pass to pkg-config
- Previous behavior had major flaw and would result in paths in libosrm.pc like: "-L-L"
when the data was "-L/path -lfoo" or just "-lpthread" with no -L/path. It only worked correctly for static libraries
- Refactors to call find_package for boost in one place (helps prepare for upcoming mason PR)
2016-10-20 12:09:27 -07:00
Patrick Niklaus
983ad3513a
Enabled address sanitizer
2016-10-19 18:30:06 +02:00
Daniel Patterson
b72dc8c0cf
Enable use of other build types than Debug and Release, and properly default to Release.
2016-10-14 12:37:01 +02:00
Daniel J. Hofmann
dbd108df8c
Reworks how we search for Lua in CMake and constrain to Lua 5.1 5.2
...
At the moment we have a FindLua52.cmake module that is happy with
Lua52 but also Lua51 and even Lua53. Let's instead pull in the official
one from CMake (since it's not yet in CMake 2.8 which we support).
https://github.com/Kitware/CMake/blob/master/Modules/FindLua.cmake
BSD licenced.
Requires Lua 5.1 or Lua 5.2, since seeing memory issues on 5.3:
https://github.com/Project-OSRM/osrm-backend/issues/2926
2016-10-05 13:23:48 +02:00
Daniel J. Hofmann
94ca782816
Bumps version to 5.4.0
2016-10-04 10:46:56 +02:00
Daniel J. Hofmann
b821a1dd98
Disables ld.gold on binutils < 2.26, resolves #2984
2016-10-03 15:41:40 +02:00
Daniel J. Hofmann
6290aeea93
Fixes Tile Unit Test Compilation
2016-09-30 16:58:50 +02:00
karenzshea
eafe3fa928
remove luajit support
2016-09-28 11:12:11 +02:00
Daniel J. Hofmann
d1f555dcef
Removes unused JSON logger.
...
References:
- https://github.com/Project-OSRM/osrm-backend/pull/2769
2016-09-28 10:01:56 +02:00
Daniel Patterson
fa5714ab82
Unset FORTIFY_SOURCE before setting to avoid warnings for compilers where FORTIFY_SOURCE is predefined. ( #2946 )
2016-09-27 21:32:22 -07:00
Daniel J. Hofmann
8b144f22c9
Exposes osrm::exception for client usage, resolves #2813
2016-09-01 09:12:35 +02:00
Michael Krasnyk
41b54cf25d
Don't use gold gc-sections for binutils < 2.25
...
Issue 2785: check gold binutils version and don't use gc-sections for versions prior 2.25
due to https://sourceware.org/bugzilla/show_bug.cgi?id=17639
readelf --debug-dump=frames build/libosrm_extract.so
Contents of the .eh_frame section:
...
readelf: Warning: Invalid length 0xfff01dd8 in FDE at 0x000020
2016-08-25 23:51:25 +02:00
Patrick Niklaus
5ee15ee339
Use webkit code snippet to detect GNU gold
2016-08-25 22:45:49 +02:00
Patrick Niklaus
01b0bce2d5
Use gold linker by default if available
2016-08-25 22:45:49 +02:00
Sandra Thieme
9957254a5a
Use c++1y instead of c++14
2016-08-23 13:01:07 +02:00
Daniel J. Hofmann
3a0eed2ee5
Make sanitizer used for Fuzz testing configurable via FUZZ_SANITIZER
2016-08-19 13:59:59 +02:00
Daniel J. Hofmann
2557bdcf39
Basic Fuzz Testing.
...
[100%] Fuzzing libosrm
/tmp/osrm-backend/build/fuzz/driver -max_len=4096 corpus > fuzz-0.log 2>&1
/tmp/osrm-backend/build/fuzz/driver -max_len=4096 corpus > fuzz-1.log 2>&1
/tmp/osrm-backend/build/fuzz/driver -max_len=4096 corpus > fuzz-2.log 2>&1
/tmp/osrm-backend/build/fuzz/driver -max_len=4096 corpus > fuzz-3.log 2>&1
References:
- http://llvm.org/docs/LibFuzzer.html
- http://llvm.org/releases/3.8.0/docs/LibFuzzer.html
- https://github.com/Project-OSRM/osrm-backend/issues/1678
2016-08-19 13:59:59 +02:00
Dane Springmeyer
71d64e8cd9
Default to c++14 / drop g++-4.8 from testing matrix
2016-07-25 19:30:43 +02:00
Patrick Niklaus
dc77d02e8a
Change OSRM version to 5.3.0
2016-06-28 10:35:45 +02:00
Daniel J. Hofmann
61ba985bc9
Prevent linker from discarding TBB symbols we need, fixes #2557
...
We build `osrm_contract` (the library) linking in libtbb. We then
build `osrm-contract` (the binary) linking in `osrm_contract` (the
library).
Because we're only using TBB's `parallel_invoke` in the code for the
binary, it seems like the linker discards some symbols in the library.
Therefore we have to link libtbb for the binary again. Even worse, the
order now matters: if we first link in `osrm_contract` and then libtbb,
we're still hitting the issue re. discarded symbols.
Therefore we first link in all dependencies (libtbb, libboost*), and
only then `osrm_contract`.
Strictly speaking, we probably have to do this for all of our binary
targets, or we will hit similar issues in the future.
2016-06-24 12:06:28 +02:00
Patrick Niklaus
a28125ee9a
Merge pull request #2577 from noblige/noblige/compile-armv7
...
option to disable LTO
2016-06-24 12:04:02 +02:00
Aleksei Potov
05dc415aba
option to disable LTO
2016-06-23 09:44:02 -07:00
Daniel Patterson
6dedd9cb72
Fix segfault when route includes very short segments.
2016-06-22 14:48:57 -07:00
Daniel J. Hofmann
256d39b572
Sync OSRM version in CMakeLists, fixes #2576
2016-06-22 17:03:31 +02:00
Michael Krasnyk
57c9525e5c
Added i686 Travis build
2016-06-20 22:45:40 +02:00
Dane Springmeyer
6ecc123d15
Fix various issues with pkg-config
2016-06-04 12:08:54 +02:00
Daniel J. Hofmann
87f00d2c4c
Restrict CMake version to 2.8.11+ for target_include_directories
2016-06-02 16:07:29 +02:00
Dane Springmeyer
4de64a92cb
fix zlib linking order
2016-05-25 09:32:27 -04:00
Patrick Niklaus
edf9e0c1ed
[skip ci] Update changelog and OSRM version
2016-05-20 18:52:00 +02:00
Dane Springmeyer
fe39d0fd10
disable BOOST_TEST_DYN_LINK if Boost_USE_STATIC_LIBS
2016-05-20 00:03:37 -04:00
Moritz Kobitzsch
ba074b0116
initial version of intersection classification
2016-05-19 16:43:46 +02:00
Daniel J. Hofmann
0f2bb5dde5
Disable builing components tool by default until GDAL 2 compatibility #1738 lands
2016-05-12 00:25:18 +02:00
Daniel J. Hofmann
98937b187f
We require Visual Studio 2015+
...
References:
- https://github.com/Project-OSRM/osrm-backend/issues/2341#issuecomment-216231618
2016-05-02 17:50:54 +02:00
Patrick Niklaus
578eda7d28
[skip ci] Add release docs
2016-04-29 14:00:10 +02:00
Patrick Niklaus
cc35d15b2d
More folds and reorder some build instructions
2016-04-25 00:19:48 +02:00
Patrick Niklaus
b6a793a1e2
Fix COVERAGE=ON and add SANITIZE=ON/OFF
2016-04-12 15:43:29 +02:00
Patrick Niklaus
6643e7f499
Integrate converage reporting
2016-04-08 20:37:51 +02:00
Patrick Niklaus
dea12779cf
basename -> filename, fixes #2027
2016-04-08 01:50:25 +02:00
Daniel J. Hofmann
a516245c94
Modularize benchmarks subproject
2016-04-06 18:36:08 +02:00
Daniel J. Hofmann
b1ed268d0e
Start modularizing the CMake buildsystem
...
The main reason for modularizing the unit tests was to split off
libboost_unit_test_framework from the osrm toolchain binaries.
Now only the unit test binaries link against it, unblocking
binary distribution without unit test library dependencies.
I started this on v4 a couple of weeks ago and hit a -llua5 issue on
Travis. By now v5 diverged quite a bit (especially in the code that I
have to stare at for debugging the issues).
https://github.com/Project-OSRM/osrm-backend/pull/2073
Let's bring this to v5+ only.
This is blocking:
- https://github.com/Project-OSRM/osrm-backend/issues/2065
- https://github.com/Project-OSRM/osrm-backend/issues/2197#issuecomment-204864938
2016-04-06 18:36:06 +02:00
Patrick Niklaus
c540c85cf8
Remove tests from default target until we get proper switchting in place
2016-04-05 22:59:14 +02:00
Patrick Niklaus
b17491ebe5
Bump osrm version
2016-04-05 22:59:14 +02:00
Patrick Niklaus
7174baa91e
Move osrm-components to BUILD_COMPONENTS flag
2016-04-05 22:59:14 +02:00
Patrick Niklaus
a964bec0f8
Add route fixture test
2016-04-05 22:59:14 +02:00
Patrick Niklaus
d51eefa1c4
Make tests build by default
2016-04-05 22:59:14 +02:00
Daniel J. Hofmann
099a805260
Initial unit tests setup for typed libosrm services
2016-04-05 22:58:32 +02:00
Daniel J. Hofmann
9d893d6d4d
Library tests build system integration
2016-04-05 22:58:32 +02:00
Daniel J. Hofmann
c3e7e96dce
Adds round trip tests for RFC 4648 Test Vectors and equality checks
2016-04-05 22:58:32 +02:00
Patrick Niklaus
59163cb2fc
Install storage_config.hpp
2016-04-05 22:58:32 +02:00
Patrick Niklaus
cb8bfa027e
Only allow to specify the common base path
2016-04-05 22:58:32 +02:00
Patrick Niklaus
29cf9e05db
Only install necessary headers
2016-04-05 22:58:32 +02:00
Patrick Niklaus
0b3289ea37
Remove the encoder/decoder dependecy from Hint
2016-04-05 22:58:32 +02:00
Patrick Niklaus
a8fc95d4e4
Move bearing to public namespace
2016-04-05 22:58:32 +02:00
Patrick Niklaus
b08b360f38
Big Restructuring / Cleanup
2016-04-05 22:58:32 +02:00
Moritz Kobitzsch
f1aa03c360
handle segregated roads (merge for turn analysis)
2016-04-05 22:58:32 +02:00
Moritz Kobitzsch
ef1e0e14ec
advanced guidance on 5.0
2016-04-05 22:58:32 +02:00
Daniel J. Hofmann
715ee66b03
Install _all_ transitively from public headers included header
2016-04-05 22:58:32 +02:00
Daniel J. Hofmann
fcf5838019
Fixes missing public header installations
2016-04-05 22:58:32 +02:00
Patrick Niklaus
f3e72623e9
Add viaroute suport for new API
2016-04-05 22:58:32 +02:00
bergwerkgis
d0636a9f6d
make AppVeyor work again
2016-03-31 16:49:30 +02:00
Daniel J. Hofmann
af554e7ed0
Provide uninstall target, closes #1972
2016-03-10 21:25:27 +01:00
Daniel J. Hofmann
a7d83b701f
Provides a CMake variable to disable ccache usage
2016-03-07 12:37:16 +01:00
Daniel J. Hofmann
d0b591307a
We're already on v4.9.1, update CMakeLists, closes #2060
2016-03-07 12:25:54 +01:00
Daniel Patterson
017ff53702
Code review updates.
2016-03-03 13:25:01 -08:00
Daniel Patterson
03d360b7bf
Enable color output when compiling with clang - makes errors a bit easier to spot.
2016-03-02 18:00:31 -08:00
Daniel J. Hofmann
becae46296
Enable decltype-based result_of type alias
2016-03-01 23:51:26 +01:00
Daniel Patterson
56e35e8ef2
Remove GeoJSON based debugging output, we can now generate vector tiles with roughly the same data on-the-fly.
2016-03-01 23:51:25 +01:00
Patrick Niklaus
085bab749f
osrm-prepare -> osrm-contract
2016-03-01 16:43:34 +01:00
Daniel J. Hofmann
4b8c0ac143
Revert "Folds json_* utilities into json subfolder and adapts includes"
...
This reverts commit cd039c69c0a92a35889e3c875b8eb53cf07377bb.
2016-02-12 15:46:24 -08:00
Daniel J. Hofmann
ec01c2a119
Folds json_* utilities into json subfolder and adapts includes
2016-02-12 15:46:24 -08:00
Daniel J. Hofmann
ef171f3acd
Properly use typed math constants instead of impl. specific hacks
...
PI is not in the stdlib, neither is 1/pi, pi*2 and so on. Instead
of relying on implementations providing these, use properly typed
math constants.
Main benefits:
- portable and
- returns constexpr, for compile-time computation
References:
- http://www.boost.org/doc/libs/1_60_0/libs/math/doc/html/math_toolkit/constants_intro.html
- http://www.boost.org/doc/libs/1_60_0/libs/math/doc/html/math_toolkit/constants.html
2016-02-12 15:46:24 -08:00
Daniel J. Hofmann
7a115e93c0
Removes check-hsgr
2016-01-26 22:57:02 +01:00
Daniel J. Hofmann
502aedb33e
Provide a way to selectively enable assertions in release mode
...
- Throwing an assertion exception for proper stack unwinding, making
sure destructors are called
- On in Debug mode, in Release, enable via:
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_ASSERTIONS=ON
Current problem that I'm seeing is that some code is not catching
exceptions or worse silently swallowing them. Would like to check the
whole pipeline before merging this in.
2016-01-21 15:37:25 +01:00
Patrick Niklaus
439eb9da3d
Create public facing libraries for extractor, contractor and datastore
...
New libraries libosrm_extract, libosrm_contract, libosrm_store
2016-01-21 06:47:34 +01:00
Moritz Kobitzsch
1c1bfd7541
Fix routing when start and target are on the same segment
...
Fixes issue #1864 . Given the simple set-up:
a --> b --> c
^-----------|
This would translate into an edge based graph (ab) -> (bc),
(bc) -> (ca), (ca) -> (ab).
Starting at the end of the one-way street (ab) and going to
the beginning, the query has to find a self-loop within the
graph (ab) -> (bc) -> (ca) -> (ab), as both nodes map to the
same segment (ab).
2016-01-19 23:26:19 +01:00
Daniel J. Hofmann
fc292cc2d8
No need for extra translation units (for edge data structures)
2016-01-11 20:11:44 +01:00
Daniel J. Hofmann
d3ef520915
Print message about ccache usage from cmake
2016-01-07 15:20:32 +01:00
Daniel J. Hofmann
cb37c0d135
Use FindOsmium.cmake to handle libosmium's buildsystem integration
2016-01-06 12:32:19 +01:00
Patrick Niklaus
02a49c8a68
Use local includes before system includes
2016-01-03 18:47:50 +01:00
Patrick Niklaus
b618a1241f
Adapt build system
2016-01-03 18:22:31 +01:00
rparanjpe
5c3398c280
name_lengths std::vector --> stxxl::vector
2015-12-15 19:12:33 -08:00
Patrick Niklaus
a8f11981e3
Include tbb in libosrm.pc
2015-12-15 21:42:32 +01:00
Patrick Niklaus
9a332d2f86
Fix osrm.hpp placement
2015-12-15 19:25:26 +01:00
Patrick Niklaus
cdb1918973
Refactor StaticRTree to remove application dependent code
...
StaticRTree now acts like a container, just returning the input data
(NodeBasedEdge) and not PhantomNodes.
2015-12-09 23:37:05 +01:00
Daniel Patterson
b9a4c322a7
Add ability to debug routing graph visually by dumping
...
annotated GeoJSON during processing.
2015-11-19 10:41:44 -05:00
Daniel J. Hofmann
963960a44c
Switch Travis builds over to trusty for Linux (simpler dependency installs), build
...
with mutliple compilers, fix debug builds.
OSX builds are disabled until we fix #1778
2015-11-17 15:15:31 -05:00
Kal Conley
a00d3dfc00
Don't generate util/version.hpp in source tree
2015-10-19 21:33:10 +02:00
Kal Conley
cd458e7a44
Don't generate util/fingerprint_impl.hpp in source tree
2015-10-19 21:33:10 +02:00
Daniel J. Hofmann
74ac283c52
We are on v4.8.1.
2015-10-09 16:53:17 +02:00
Daniel Patterson
e45656e5bf
Refactor edge expansion into extract phase. New temporary file is generated - '.osrm.ebg' which is used by
2015-10-06 09:23:17 -07:00
Daniel J. Hofmann
5379a555db
Use ccache by default if available and a suitable compiler is used.
...
This checks if `ccache` is available, and if so uses it.
The user can stil disable it via the ccache env variable, quoting:
disable (CCACHE_DISABLE) [boolean]
When true, ccache will just call the real compiler, bypassing the cache completely. The default is false.
At least Clang required `CCACHE_CPP2`.
The user does not have to set up anything, just to install ccache.
Of course, things like the cache's max size, its location and so on can
be configured.
References:
- https://ccache.samba.org/manual.html
2015-10-06 11:18:43 +02:00
Daniel J. Hofmann
8f8bd05f83
Silence warnings with GCC, LTO does not yet respect the -isystem switch
2015-09-30 18:22:26 +02:00
Daniel J. Hofmann
b1155a202c
Re-enable manual -fPIC flag from cae59c7.
2015-09-30 18:22:26 +02:00
Daniel J. Hofmann
d4aaaf16f8
Revert "Re-enable position independent code, but in a portable way."
...
This reverts commit 2143dc97fa65c786c6566db1343ad270347dcfd3.
2015-09-30 18:22:26 +02:00