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
Dennis Luxen
58de37e822
renamed: DataStructures/* -> data_structures/*
2014-11-28 12:15:31 +01:00
Dennis Luxen
7b3a0c5105
renamed: Contractor/* -> contractor/*
2014-11-28 10:30:21 +01:00
Dennis Luxen
592034653c
renamed: Benchmarks/* -> benchmarks/*s
2014-11-28 10:15:27 +01:00
Dennis Luxen
8d9f830c53
change includes to lower case algorithms/
2014-11-28 10:12:08 +01:00
Dennis Luxen
1391420699
renamed: ../Benchmarks/StaticRTreeBench.cpp -> ../Benchmarks/static_rtree.cpp
2014-11-27 19:04:30 +01:00
Dennis Luxen
5e2462e061
renamed: DataStructures/RestrictionMap.cpp -> DataStructures/restriction_map.cpp
...
renamed: DataStructures/RestrictionMap.h -> DataStructures/restriction_map.hpp
2014-11-27 18:38:21 +01:00
Dennis Luxen
acd1919e8d
renamed: Util/Azimuth.h -> Util/bearing.hpp
2014-11-26 16:55:18 +01:00
Dennis Luxen
becb6cf5bf
compile renamed object file
2014-11-17 14:58:36 +01:00
Dennis Luxen
f692103c81
fix build on windows by linking against the right libs
2014-11-17 14:58:35 +01:00
Dennis Luxen
6d9598cd4c
link against expat not libxml2, good riddance
2014-11-17 14:58:33 +01:00
Dennis Luxen
ac9566d3d7
add include dir to libosmium
2014-11-17 14:58:31 +01:00
alex85k
c75ce210ea
support building tools on Windows
2014-11-16 21:33:41 +05:00
Patrick Niklaus
520f7fa2de
Add UnitTest for DP
...
Conflicts:
CMakeLists.txt
2014-10-29 00:40:34 +01:00
Dennis Luxen
efc938d870
fix building of tests/benchmark
2014-10-28 09:11:14 -04:00
Dennis Luxen
369f669227
break out PhantomNode.h into a header/impl combo, rename to new naming scheme.
2014-10-27 17:56:06 -04:00
Dennis Luxen
c1136099a9
fix link order to make symbol available in libosrm
2014-10-20 13:26:51 +02:00
Dennis Luxen
06f8a975c0
prevent double compile of dependent compile units
2014-10-20 13:04:44 +02:00
alex85k
c3aec4f627
do not use gcc-ar for MinGW 4.9
2014-10-18 19:13:46 +06:00
alex85k
113852eed4
use math defines on Mingw
2014-10-18 18:47:17 +06:00
Dennis Luxen
edd8caa2bf
compile Fingerprint only once
2014-10-17 12:30:11 +02:00
Dennis Luxen
4fbefaef9a
catch an uncaught exception and give git revision in springclean tool
2014-10-13 09:42:47 +02:00
Dennis Luxen
274140d309
refactor SimpleLogger into simple_logger compile unit
2014-10-10 19:32:49 +02:00
Dennis Luxen
ed960ccc8d
refactor angle computation into class/compile unit
2014-10-10 18:47:28 +02:00
Dennis Luxen
52ed8a7ed0
move springclean functionality in its own tools, remove from datastore
2014-10-10 16:55:24 +02:00
Dennis Luxen
9449c99e25
enable partitioning on LTO, good riddance GCC 4.7
2014-10-10 10:46:43 +02:00
Dennis Luxen
9c3a572646
link unlocking tool against Threads
2014-09-29 16:59:09 +02:00
Dennis Luxen
abc6b4180c
better checking for luabind compilation, fixes some OSX woes
2014-09-19 16:33:24 +02:00