Daniel J. Hofmann
f46706843b
STXXL's debug build creates stxxl_debug.{a,so}, adapts FindSTXXL
...
References:
- https://github.com/Project-OSRM/osrm-backend/issues/1885
2016-01-12 13:40:36 +01:00
Mathias Gug
c1709da6bf
Fix typo.
2016-01-05 14:25:14 -05:00
Mathias Gug
dcfa81f983
Add debian revision.
2016-01-05 14:15:55 -05:00
Mathias Gug
42b1eaa240
Use OSRM versions for Debian package version.
2016-01-05 11:44:24 -05:00
Daniel J. Hofmann
2d455018ae
We are at 2016 for the license
2016-01-04 18:13:05 +01:00
Patrick Niklaus
b618a1241f
Adapt build system
2016-01-03 18:22:31 +01:00
Patrick Niklaus
a8f11981e3
Include tbb in libosrm.pc
2015-12-15 21:42:32 +01:00
Fabien Girard
16fd5249dd
Fix pkgconfig cmake template
2015-11-19 17:38:04 +01: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
ca0f8ed653
Immensly increase lua/luabind detection and check in buildsystem.
...
Instead of including the `luabind.hpp` header that transitively includes
basically everything else, we now only include the appropriate header
for luabind's open function.
It is important that this function is declared in the header but the
definition comes from the luabind shared object (library), such that we
can detect linker errors, too.
By only including this header, we also no longer transitively include
the header for the `luaL_newstate` function, with we have to add
manually.
With these changes, detecting, compiling, linking and checking for
lua/luabind with cmake now works instantly, instead of the 3-4
seconds as it was before! Yay, progress!
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 Patterson
b2d444d782
Only replace fingerprint file when MD5 changes. Avoids rebuilding several things if nothing has actually changes, as cmake is only looking at timestamps.
2015-09-04 14:07:40 +02:00
Daniel J. Hofmann
c39ca7189b
Remove protobuf dependencies from build system
2015-08-31 16:54:22 +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
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
d241aef502
fix checking for successful compilation of stxxl with OpenMP
2015-01-29 12:52:54 +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
0c1101739d
renamed: Server/DataStructures/*.h -> Server/data_structures/*.hpp
2015-01-27 12:14:08 +01:00
Dennis Luxen
ef9074f8e4
renamed: Util/finger_print.* -> Util/fingerprint.*
...
thx @emiltin
2015-01-13 11:16:13 +01:00
Dennis Luxen
ccc4607d6d
renamed: Util/GraphLoader.h -> Util/graph_loader.hpp
2014-12-22 16:09:01 +01:00
Dennis Luxen
58de37e822
renamed: DataStructures/* -> data_structures/*
2014-11-28 12:15:31 +01:00
Dennis Luxen
4277eed1b6
Revert "remove whitespace from package description"
...
This reverts commit 6f5703a5fe
.
2014-10-15 13:21:42 +02:00
Dennis Luxen
6f5703a5fe
remove whitespace from package description
2014-10-15 12:55:40 +02:00
Dennis Luxen
fd747c7340
propagate Lua include dir when compile-checking Luabind, fixes #1196
2014-09-25 12:58:23 +02:00
Dennis Luxen
abc6b4180c
better checking for luabind compilation, fixes some OSX woes
2014-09-19 16:33:24 +02:00
alex85k
f14c6e6845
Auto-detect Lua compatible with installed Luabind
2014-09-18 23:34:51 +06:00
Dennis Luxen
2e20fdb462
allow building of packages
2014-08-11 16:16:56 +02:00
alex85k
7335e0809a
Globally rename UUID to FingerPrint
2014-06-05 10:31:19 +02:00
Patrick Niklaus
da1fd96d4e
Port extractor to TBB
2014-05-21 21:49:22 +02:00
Dennis Luxen
d21f63d327
activate LTO on platforms that support it, ie. most recent compilers
2014-04-01 18:11:45 +02:00
Dane Springmeyer
f0dd1fdfc7
pkg-config fixes
2013-12-20 14:00:30 -05:00
DennisOSRM
838322299a
generate pkgconfig file
2013-12-20 13:13:35 +01:00
Dennis Luxen
de790c7c19
delete file
2013-12-16 11:21:46 +01:00
DennisOSRM
7de27df309
fix linking on Ubuntu 13.10
2013-11-20 16:22:39 +01:00
DennisOSRM
b06db1ba39
Merge branch 'dep-liblua' of https://github.com/NochEinDirk/Project-OSRM-contribute into NochEinDirk-dep-liblua
2013-11-20 10:56:47 +01:00
Dennis Luxen
3da664236c
reverting premature revert
2013-11-12 17:39:24 -05:00
Dirk L
8f5d9c4816
Merge branch 'develop' into dep-liblua
2013-11-08 15:20:56 +01:00
Dirk L
7102c77e0b
Merge branch 'master' into dep-liblua
2013-11-08 15:10:53 +01:00
Dennis Luxen
7cf46afc48
Remove old facade from UUID generation
2013-10-15 14:31:31 +02:00
Dennis Luxen
427db3f29a
Don't build deleted classes
2013-10-15 14:14:54 +02:00
Dennis Luxen
c66fced161
rename createhierarchy.cpp to more canonical name
2013-10-14 17:03:46 +02:00
Dennis Luxen
29499f21c5
License change to (simplified) 2-clause BSD. Good riddance, AGPL
2013-10-14 13:42:28 +02:00
Dirk L
91a2e56215
Merge branch 'dep-liblua' into develop-lua
2013-09-11 18:27:51 +02:00
Dirk L
e6681af9d0
CMakeLists.txt: Lua5.2 support.
...
Because the current Debian unstable is using
* Luabind which is depending on Lua5.2
* LuaJIT which has a Lua5.1 API
the code were using the Lua5.1 header files but were linked against
Lua5.2 library.
Now both are using Lua5.2 (libluajit-5.1-dev must not be installed
during CMAKE !), which seems to work for the OSRM-Extractor.
2013-09-11 17:25:33 +02:00
Dennis Luxen
9d23dee3fc
Merge branch 'develop' into experimental/program_options
2013-08-19 17:03:47 +02:00
Dennis Luxen
70b8cef318
Fixes #709 , out-of-source builds from arbitrary directories
2013-08-19 16:55:56 +02:00
Emil Tin
e42b8fc37d
use boost program_options in extractor
2013-08-14 15:15:35 +02:00
Dennis Luxen
c8e0e5eca2
Export compile commands
2013-08-14 11:57:54 +02:00
DennisOSRM
3515ddcfe6
Automatic rebuild
2013-07-19 16:58:13 +02:00
DennisOSRM
90303d5952
further addition to cmake script
2013-07-19 16:36:57 +02:00
DennisOSRM
4961b819f3
Trigger rebuild of fingerprint everytime
2013-07-19 15:00:41 +02:00
DennisOSRM
c3dab15eb6
Several lookup fixes and fingerprinting of files with input IO, thx @alex85k
2013-07-18 14:11:45 +02:00
DennisOSRM
a4f6ec516b
Remove unnecessary file
2013-07-17 16:29:11 +02:00
DennisOSRM
b234760e92
Check if platform supports 64 bits
2013-07-03 13:32:31 +02:00
DennisOSRM
3119e4b82b
Use LuaJIT if available
2013-07-03 11:41:14 +02:00
Dennis Luxen
85e333127a
Manually merging cmake support
2013-04-22 22:24:40 +02:00
Dennis Luxen
d52d86ae82
Manually merging cmake support
2013-04-22 22:23:53 +02:00