Daniel J. Hofmann
4618b502ac
Enforces GCC>=4.9 and Clang>=3.4 requirement with CMake
2016-12-15 12:47:50 +01:00
Michael Krasnyk
84b618ed1a
Add headers consistency check
2016-12-15 10:58:17 +01:00
karenzshea
d5904d5756
increase template depth on clang and gcc builds
2016-12-15 10:55:16 +01:00
Daniel J. Hofmann
0f59b78c02
Rewrite lua bindings using sol interface
2016-12-15 10:55:16 +01:00
Daniel Patterson
3dfbf42e61
Don't mark all lanes as designated when there are blank lane specifiers in the tag.
2016-12-15 10:55:16 +01:00
Daniel Patterson
468d8c0031
Refactor logging, improve error handling workflow, clang-format. ( #3385 )
2016-12-06 12:30:46 -08:00
Daniel Patterson
928a6f0c7d
Variant got re-packaged, need to update search paths. ( #3392 )
2016-12-01 16:59:29 -08:00
Patrick Niklaus
20c8ac0272
Bump osrm version to 5.5
2016-12-01 22:12:28 +00:00
Patrick Niklaus
c99c8bccbc
Make the binutil detection work the same for clang and gcc
...
This uses the cmake internal find_program that will utilize the PATH at
configuration time. This way we don't need to pass CXXFLAGS to clang.
2016-12-01 21:55:17 +01:00
Patrick Niklaus
735191255d
No need to set ccache explicitly if its in the path
2016-12-01 21:55:17 +01:00
Dane Springmeyer
43566bfd14
support -flto with clang++
2016-12-01 21:55:17 +01:00
Patrick Niklaus
4489c8dfc2
Expose LibOSRM find_package style variable to work as subproject
2016-11-29 15:38:51 +00:00
Patrick Niklaus
ee63e39ff5
Add $ORIGIN and @executable_path to RPATH
2016-11-29 15:37:11 +00:00
Patrick Niklaus
dd811539a3
Remove overriding c++ compiler from cmake on mason build
2016-11-19 17:02:31 +01:00
Patrick Niklaus
a764fd1f29
Don't expose all OSRM flags only the ones needed by external code
2016-11-19 17:02:31 +01:00
Dane Springmeyer
fa1a0a1325
Ensure pkg-config reports OSRM_LIB_LINKER_FLAGS
2016-11-12 14:35:32 +01:00
Patrick Niklaus
12ded539aa
Merge pull request #3235 from Project-OSRM/mason-improvements
...
Mason improvements
2016-11-10 16:58:18 +01:00
Michael Krasnyk
2501882adb
Remove duplicated linking of boost and tbb libraries
2016-11-09 12:44:49 +01:00
Dane Springmeyer
b8898ef410
mason improvements
2016-11-08 15:29:49 -08:00
Michael Krasnyk
9d24a4422a
FindOsmium invoke is required for MSVC build dependencies
...
The commit is aprtial revert of
87d09f7
| * make adjustments based on PR review from @themarex
because osmium requires ws2_32
2016-11-02 18:40:17 +00:00
Dane Springmeyer
9435254661
Merge pull request #3119 from Project-OSRM/masonize
...
Masonize
2016-10-28 13:39:37 -07:00
Michael Krasnyk
b5c77de923
Fix msvc linking of boost libraries
2016-10-28 12:42:36 -07:00
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
Daniel J. Hofmann
119fb63576
LTO is broken on GCC < 4.9.0, disable it.
...
References:
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57038
- https://github.com/Project-OSRM/node-osrm/pull/112
2015-09-30 18:22:26 +02:00
Daniel J. Hofmann
3f7afd47d2
Do not violate the One Definition Rule (ODR).
...
By linking in the coordinate object file twice, we violate the ODR,
resulting in our program to not be "well-formed" in language lawyer
speak (hint: bad, very bad).
(How come no one noticed this all the time, this was introduced
somewhere between v4.5.0 and v4.6.0 from a quick look...)
References:
- C++14 standard (N3936.pfd): 3.2 One definition rule [basic.def.odr]
- http://eel.is/c++draft/basic.def.odr
2015-09-30 18:22:26 +02:00
Daniel J. Hofmann
809bdb7c1f
Fixes version generation, no longer derives version on git tags.
...
We were stuck on the 4.5.0 tag from develop, since we searched for the
latest tag, but release tags are done on the master branch.
This commit rips out all the code for deriving the version on git tags.
Instead, we define major, minor, and patch versions in the CMakeLists
and then pass it on to:
- the `libosrm.pc` `pkg-config` file
- a `version.hpp` header that makes use of the preprocessor's string
concatenation to provide an easy way for generating version string
literals such as "v4.8.0".
That is, in the source code please now use the following defines:
#define OSRM_VERSION_MAJOR "@OSRM_VERSION_MAJOR@"
#define OSRM_VERSION_MINOR "@OSRM_VERSION_MINOR@"
#define OSRM_VERSION_PATCH "@OSRM_VERSION_PATCH@"
#define OSRM_VERSION "v" OSRM_VERSION_MAJOR "." OSRM_VERSION_MINOR "." OSRM_VERSION_PATCH
2015-09-30 18:22:25 +02:00
Daniel J. Hofmann
0424ff0818
Do not pass linker flags for static libraries.
...
Static libraries get the linker flags from the user / pkg-config.
2015-09-30 18:20:00 +02:00
Daniel J. Hofmann
9b952ff48c
Improve debug build performance while keeping symbols.
...
- remove profiling/coverage mix from debug build, as it is useless as of
now, re-enable this for a separate coverage build in the future
- use gcc's `-ggdb` and `-Og` flag (requires recent gcc) to provide
better debug information targeted for gdb and optimize what we can
- use `-fno-inline` and `-fno-omit-stack-pointer`, in order to be able
to jump around in gdb without functions being gone and keeping the
stack reference
2015-09-30 18:20:00 +02:00
Daniel J. Hofmann
c5064710a8
Re-enable position independent code, but in a portable way.
...
CMake 2.8.9 introduce a `POSITION_INDEPENDENT_CODE` property.
This sets `-fPIE` on executables, giving us back optimizations such as
inlining of global variables and functions, while setting `-fPIC` on
libraries.
Although we do not need position independent code on executables, it
seems like some gcc versions (like 4.9.2) have issues in combinations
with `_FORTIFY_SOURCE`.
On shared libraries, CMake should per documentation even use position
independent code by default.
References:
- http://www.cmake.org/cmake/help/v3.0/prop_tgt/POSITION_INDEPENDENT_CODE.html#prop_tgt:POSITION_INDEPENDENT_CODE
- http://public.kitware.com/pipermail/cmake-developers/2012-May/015839.html
- https://github.com/Project-OSRM/osrm-backend/pull/1647
- cae59c7395
2015-09-30 18:20:00 +02:00
Daniel J. Hofmann
57e522065a
Add linker optimizations and dead code and data elimination.
...
Linkers also have options we can configure! The most usefull feature is
to give every function its own section. This results in some bloat at
compile time, but at link time now the linker can do dead code and data
elimination by simply discarding appropriate sections.
This works by splitting the `.text` section in a way that makes it
possible to later only pull in sections that are actually referenced.
That is, the basic idea is to keep the matching between sections and
functions intact, so we can optimize based on it in the linking stage.
Note: there's still an issue with how `libOSRM.a` gets build. CMake
currently passes the linker flags on to ar, in order to create a static
library. But ar does not understand the linker's flags.
Referenes:
- https://sourceware.org/binutils/docs/ld/Options.html#Options
- http://elinux.org/images/2/2d/ELC2010-gc-sections_Denys_Vlasenko.pdfMCþ "
- http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_EXE_LINKER_FLAGS.html
- http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_MODULE_LINKER_FLAGS.html
- http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_SHARED_LINKER_FLAGS.html
- http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_STATIC_LINKER_FLAGS.html
2015-09-30 18:20:00 +02:00
Daniel J. Hofmann
7143daf500
There is no CMAKE_LINKER_FLAGS variable.
...
There really isn't; deal with it.
Also, those are not linker flags but instead meant for the compiler.
References:
- http://www.cmake.org/cmake/help/v3.0/manual/cmake-variables.7.html
2015-09-30 18:20:00 +02:00
Daniel J. Hofmann
71a00fc01b
Make lto detection more robust and not resetting cxx flags when lto fails.
...
This refines the last commit of parallelizing lto.
Discussion: this is ugly as hell, dispatching 1/ on the availability of
the `-flto` flag, then 2/ on the compiler since GCC allows `-flto=n`
whereas Clang for example does not.
I tried setting the CMake property `INTERPROCEDURAL_OPTIMIZATION`,
without any effect. All I could see was some lto related utilities in
the cmake debug output, but not in the actual compiler or linker
invocation.
This would eliminate the need for our hacks, with 1/ using an option
`WITH_LTO` setting `ON` by default, and based on this value setting the
`INTERPROCEDURAL_OPTIMIZATION` flag with CMake doing the actual work of
selecting the best LTO method on the target platform.
By the way, this also fixes a bug where we reset the `CMAKE_CXX_FLAGS`
to a variable that was never defined, resulting in setting the flags to
an empty string. Yay CMake, as usual.
References:
- http://www.cmake.org/cmake/help/v3.0/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.html
2015-09-30 18:20:00 +02:00
Daniel J. Hofmann
941483c14d
Parallelize optimization and code generation for link time optimization.
...
This parallelizes the `-flto` feature resulting in parallel optimization
and code generation for link time optimization based on the number of
logical processors available.
Note: this has the side-effect of using more memory during linking.
References:
- https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html (see: -flto)
- http://www.cmake.org/cmake/help/v3.0/module/ProcessorCount.htmMC
2015-09-30 18:20:00 +02:00
Daniel J. Hofmann
72c0feb048
Silence warnings for system headers that we or third_party transitively includes.
...
GCC with link time optimizations does not to respect this mode
unfortunately, reuslting in warnings in release (default) build
mode from system includes such as boost, luabind and so on.
2015-09-30 18:18:36 +02:00
Daniel J. Hofmann
9e20dbe226
Remove -fPIC flag from build system.
...
This remove the `-fPIC` flag, indicating position independant code
generation, from the build system.
Citing GCC's official code generation docs:
> This option makes a difference on the m68k, PowerPC and SPARC.
We do not support any of these architectures, so remove the flag!
References:
- https://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html#Code-Gen-Options
2015-09-30 18:18:36 +02:00
Daniel J. Hofmann
06f2738c03
Add stricter compiler warnings to build system.
...
These are for standard compliance and should on by default:
-Wall -Wextra -pedantic
The problem is that even `-Wall` and `-Wextra` does not cover all
warnings, as to not break backward compatibility. Clang therefore
has the `-Weverything` flag, that really includes everything but is
overkill for the day to day development.
Thus, we in addition add:
-Wuninitialized -Wunreachable-code
to guard against undefined behavior from reading uninitialized variables
and warn for unreachable code.
With:
-Wstrict-overflow=1
the compiler warns us when it's doing optimizations based on the fact
that signed integer overflows are undefined behavior.
With:
-D_FORTIFY_SOURCE=2
we tell the compiler to replace functions like strcpy with strncpy where
it can do so, resulting in cheap and useful buffer overflow protection.
References:
- https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
- https://securityblog.redhat.com/2014/03/26/fortify-and-you/
- https://wiki.debian.org/Hardening
2015-09-30 18:18:36 +02:00
Daniel J. Hofmann
65ee5c4bbb
Exclude unit tests and benchmarks from doxygen and make it more robust.
...
Only specify the flags we change from the default.
doxygen -g Doxyfile
Generates a default Doxyfile.
Also, make the docs not depend on `dot`, but conditionally create graphs
if `dot` is available, and if not still generate docs.
2015-09-22 16:26:21 +02:00
Daniel J. Hofmann
2891de2fcd
Add dependency on Dot to CMakeLists for Doxygen integration.
...
Reference:
- http://www.cmake.org/cmake/help/v3.0/module/FindDoxygen.html
2015-09-22 16:26:21 +02:00
Daniel Patterson
895d8179a2
Adds basic Doxygen support. Run and docs will end up in
2015-09-22 16:26:21 +02:00
Lauren Budorick
bac6703f8e
Implement raster source feature to read data from third-party sources, to be used in lua profiles.
...
* Adds a data structure, RasterSource, to store parsed + queryable data
* Adds bindings for that and relevant data structures as well as source_function and segment_function
* Adds relevant unit tests and cucumber tests
* Bring-your-own-data feature
2015-09-03 22:28:18 -07:00
Chau Nguyen
b15f8f68e4
refactor and improve the round trip computation of multiple SCCs
...
Problem:
- old solution was slow
- depending on the result of TarjanSCC, new distance tables and new phantom node vectors were created to run tsp on it
Solution:
- dont create new distance tables and phantom node vectors
- pass an additional vector with the information which locations are in the same component and ignore all others
fix bug for scc split computation
2015-09-01 15:20:33 +02:00
Daniel J. Hofmann
c39ca7189b
Remove protobuf dependencies from build system
2015-08-31 16:54:22 +02:00
Patrick Niklaus
49adf2192a
Move calculate_coordinate to algorithms/
...
Fixes #1367
2015-08-12 13:02:18 +02:00
Patrick Niklaus
8f4e332409
Link restrictions to datastore test
2015-07-08 20:26:54 +02:00
Patrick Niklaus
f0389c0b2f
Restructure CMakeFile to fix shared library linking errors
2015-07-08 18:26:25 +02:00
Patrick Niklaus
fd30e82836
Add graph compressor unit tests
2015-07-01 18:07:29 +02:00
Patrick Niklaus
3ef34fbb56
Rename GeometryCompressor and add unit tests
2015-07-01 18:07:29 +02:00
Patrick Niklaus
a57fb4f1ab
First step into overhauling the edge storage
2015-06-01 17:22:12 +02:00
Patrick Niklaus
e76d8df246
Fix tools to build with new graph reader interface
2015-05-28 15:18:48 +02:00
Patrick Niklaus
1164a65df8
Refactor processing_chain by splitting into sub functions
2015-05-28 15:18:48 +02:00
Dennis Luxen
c03aec364c
add comparison tool for graph classes
2015-04-16 11:25:43 +02:00
Patrick Niklaus
f89f4bd20b
Add option to enable json logging
2015-04-13 22:39:55 +02:00
Matthias Kuhn
d11c0bbd5c
Do not compile Coordinate sources directly into the OSRM library
...
It is already included in the COORDINATES "OBJECT" target to which the OSRM
library is linked.
This fixes the possibility to build OSRM as a shared library.
2015-03-31 16:57:41 +02:00
Dennis Luxen
19ac831c2e
remove another quoted compare
2015-03-31 12:59:56 +02:00
Dennis Luxen
23b413a398
remove quotes from string compares against variable in CMakeLists
2015-03-31 12:35:20 +02:00
Dennis Luxen
098de196e2
reactivate profiling flags for debug build
2015-03-31 11:21:36 +02:00
Dennis Luxen
5adf792fad
fix build issue where cmake does not pick up generated output of a custom target
...
renamed: ../util/fingerprint.cpp.in -> ../util/fingerprint_impl.hpp.in
2015-03-31 10:45:35 +02:00
Dennis Luxen
81af7d73a6
make FINGERPRINT a global dependency
2015-03-30 15:55:23 +02:00
Dennis Luxen
23e4e0786d
also enable C as a project language
2015-03-30 13:26:06 +02:00
Dennis Luxen
0640ce9632
set project and fingerprint target language to CXX explicitly, fixes AppVeyor build. Potentially Travis, too.
2015-03-30 13:21:03 +02:00
Dennis Luxen
60663b5433
reorder build dependencies
2015-03-30 11:09:41 +02:00
Dennis Luxen
5565662d87
fix compilation with CMake 3.2, closes #1422
...
CMake 3.2 changed the behavior of add_custom_command and ungenerated dependencies. Replaced with add_custom_target that works on version 2.8+
2015-03-23 16:14:24 +01:00
Dennis Luxen
cfaacf7cb2
put util/compute_angle.cpp into OBJECT library to avoid repetetive compiles
2015-03-03 17:58:17 +01:00
Patrick Niklaus
2115a67d24
Link libOSRM with compute_angle
2015-03-03 00:48:57 +01:00
Patrick Niklaus
b5228dcda0
Detect possible uturns in the data.
...
To make them work, we have to disable PhantomNode splitting
for this coordinates.
2015-03-03 00:48:56 +01:00
RockLobster
bad2576397
Replaced CMAKE_SOURCE_DIR in osrm root dir's cmake file with CMAKE_CURRENT_SOURCE_DIR
...
=> Allows osrm to be used as a subproject aswell
2015-02-25 18:25:03 +01:00
Dennis Luxen
9e09168597
un-lint CMakeLists.txt
2015-02-16 14:18:04 +01:00
Dennis Luxen
3d55622237
search quietly for OpenMP
2015-02-05 11:37:55 +01:00
Dennis Luxen
97f6468663
yet another try to unhack libgomp linking: use OpenMP binding if and only if present
2015-01-29 17:29:03 +01:00
Dennis Luxen
a883b73981
add explicit cmake checking step for libgomp
2015-01-29 17:01:08 +01:00
Dennis Luxen
da469911d3
always link against libgomp
2015-01-29 16:23:04 +01:00
Dennis Luxen
8b2ca6b13d
check if stxxl compiles with or without libgomp, fixes #1361
2015-01-29 12:52:54 +01:00
Dennis Luxen
b20b7e65bf
renamed: Util/* -> util/*
2015-01-27 17:47:23 +01:00
Dennis Luxen
1187f83ffd
renamed: Library/*.h -> library/*.hpp
2015-01-27 16:35:19 +01:00
Dennis Luxen
dd3b8469dd
renamed: Include/* include/*
2015-01-27 13:17:18 +01:00
Dennis Luxen
9672f00ec3
renamed: Server/*/*.h -> server/*/*.hpp
2015-01-27 12:35:29 +01:00
Dennis Luxen
0c1101739d
renamed: Server/DataStructures/*.h -> Server/data_structures/*.hpp
2015-01-27 12:14:08 +01:00
Dennis Luxen
ba10f97420
add third_party directory node to the include dirs
2015-01-20 18:23:10 +01:00
Dennis Luxen
50c460ebd5
install mapbox/variant headers from third_party directory
2015-01-20 18:07:45 +01:00
Dennis Luxen
ec9b2dbe42
remove debug info from binaries
2015-01-20 17:57:47 +01:00
Dennis Luxen
01f3237416
speed up nearest neighbor query by pruning, move coordinate calculations away from library interface
2015-01-20 16:24:49 +01:00
Dennis Luxen
f2b556adfd
umbenannt: UnitTests/* -> unit_tests/*
2015-01-15 18:39:26 +01:00
Dennis Luxen
f5caf96d2e
add new include dir of libosmium
2015-01-13 17:14:54 +01:00
Dennis Luxen
5f28a7db0d
add some whitespace
2015-01-13 15:52:24 +01:00
Dennis Luxen
d0c99f1999
fix linking of benchmarks and tests
2015-01-13 15:45:27 +01:00
Dennis Luxen
bf71781ee9
new file: Util/mercator.cpp
...
renamed: Util/MercatorUtil.h -> Util/mercator.hpp
2015-01-13 14:57:23 +01:00
Dennis Luxen
ef9074f8e4
renamed: Util/finger_print.* -> Util/fingerprint.*
...
thx @emiltin
2015-01-13 11:16:13 +01:00
Dennis Luxen
6da33cafe5
rebase branch onto latest develop, report changes. hurt a little
2015-01-06 13:27:50 +01:00
Dennis Luxen
06f82d5e8a
install variant by default
2015-01-06 13:22:12 +01:00
Dennis Luxen
89dd0c4a40
install headers with .hpp suffix
2015-01-06 13:22:12 +01:00
Dennis Luxen
a21e4c5a0b
link library against exception lib
2015-01-06 11:00:44 +01:00
Dennis Luxen
25326b571b
renamed: Util/OSRMException.h -> Util/osrm_exception.hpp
2015-01-05 15:40:05 +01:00
Dennis Luxen
2caeb4008c
renamed: Util/GitDescription.cpp.in -> Util/git_sha.cpp.in
...
renamed: Util/GitDescription.h -> Util/git_sha.h
2015-01-05 14:32:04 +01:00
Patrick Niklaus
d3f5db576a
Enable gcc color output when available
2015-01-04 23:13:15 +01:00
Dennis Luxen
df0c1106ce
compile and link restriction map object to components and routes
2014-12-23 11:46:25 +01:00
Dennis Luxen
47a2271e27
copy edits:
2014-12-23 11:30:45 +01:00
Dennis Luxen
a5c824f694
adapt tiny_components.hpp to have the same interface as bfs_components.hpp
2014-12-22 16:43:57 +01:00
Dennis Luxen
4445f21e8a
renamed: Tools/* -> tools/*
2014-11-28 15:36:40 +01:00
Dennis Luxen
0f7cb12e97
renamed: ThirdParty/* -> third_party/*
2014-11-28 15:22:26 +01:00
Dennis Luxen
ae7300f9b4
renamed: extractor.cpp -> extract.cpp
...
renamed: Extractor/* -> extractor/
2014-11-28 15:00:48 +01:00
Dennis Luxen
1d8c43b445
renamed: Descriptors/* -> descriptors/*
2014-11-28 14:36:38 +01:00