Commit Graph

236 Commits

Author SHA1 Message Date
DennisOSRM
ac07c78664 build libOSRM static library implicitly. Overridable by -DBUILD_SHARED_LIBS:BOOL=OFF 2013-12-20 13:24:25 +01:00
DennisOSRM
4a3db7e2c3 Merging PR #847 manually 2013-12-20 13:15:57 +01:00
DennisOSRM
838322299a generate pkgconfig file 2013-12-20 13:13:35 +01:00
Dane Springmeyer
5e4121ac58 libosrm as static lib 2013-12-18 18:08:25 -05:00
Dennis Luxen
81d8c8f9bf don't inline code in debug build 2013-12-18 18:33:24 +01:00
Dennis Luxen
0d246a4422 enable profiling information in debug build 2013-12-18 13:16:32 +01:00
Dennis Luxen
21ff3fbccd un-lint'ing CMakeLists.txt 2013-12-17 21:42:00 +01:00
Dennis Luxen
90efbefbec install includes to include/osrm 2013-12-17 20:26:15 +01:00
Dennis Luxen
fd2f000075 install lib header files with make install target 2013-12-17 17:59:44 +01:00
Dane Springmeyer
bb244646df bake gitdescription and uuid into OSRM library to avoid failure points of linking them directly 2013-12-16 18:49:35 -05:00
Dane Springmeyer
238dd07cf6 fix linking order to unbreak linux builds against static protobuf and libz 2013-12-16 17:03:17 -05:00
Dennis Luxen
cb6f4ad646 (partially) sanitize capitalization 2013-12-16 17:58:57 +01:00
Dennis Luxen
f7b72dd136 minor typo 2013-12-16 17:52:45 +01:00
Dennis Luxen
b1c83e6588 link against right pthreads library 2013-12-16 17:25:17 +01:00
Dennis Luxen
c55bd11377 Merge PR 838
Conflicts:
	CMakeLists.txt
2013-12-16 12:52:41 +01:00
Dennis Luxen
885a9df356 remove duplicate symbol 2013-12-16 11:39:38 +01:00
Dennis Luxen
0a373018c6 properly link osrm-prepare 2013-12-16 11:36:59 +01:00
Dennis Luxen
3c2bf76103 implements #839, check for 32 bits properly, bump required boost version to 1.46 2013-12-16 11:21:30 +01:00
Dane Springmeyer
13bc41fc36 CMake: Respect CXXFLAGS set in environment
Without this change the `CXXFLAGS` environment setting is not respected (tested on OS X 10.8/clang++)
2013-12-15 15:32:15 -05:00
Dennis Luxen
b030fe7db2 break out Coordinate in compile unit 2013-12-13 17:26:57 -05:00
Dennis Luxen
c3396fa6fd add compile targets for the main binaries (not the aux utils) 2013-12-13 10:55:57 -05:00
Dennis Luxen
5ef7ea794a move Hilbert curve computation in compile unit 2013-12-08 15:52:20 +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
cabaad4b17 replaced contigouos output data with collection of small'ish sub blocks. saves (re-)allocations. also removed a remaining stringstream 2013-11-14 17:16:26 -05:00
Dennis Luxen
dc4a3e9b89 untangle server and http components 2013-11-14 12:29:56 -05:00
Dennis Luxen
a9f54c44e9 move Reply into compile unit 2013-11-13 18:42:42 -05:00
Dennis Luxen
1863e85bf5 move polyline compressor into compile unit 2013-11-13 17:32:44 -05:00
Dennis Luxen
abb7509f03 link against libc++ on OS X Mavericks by default 2013-11-13 11:08:27 -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
8d3fdf45b9 implements #781 2013-11-06 17:13:09 -05:00
Dane Springmeyer
ba12e31280 osx build: only set -std=c++11 flag for >= 10.9 2013-11-04 14:37:25 -08:00
Dennis Luxen
a33542c9b5 link libosrm against librt on linux/gcc 2013-10-30 16:35:23 +01:00
Dennis Luxen
3a1d98648f link tool against librt on linux/gcc 2013-10-30 16:33:16 +01:00
Dennis Luxen
419f708d87 build unlock tool and link against git descriptor 2013-10-30 13:01:49 +01:00
Dennis Luxen
9bf6bf2c78 link against on linux/gcc 2013-10-28 14:51:20 +01:00
Dennis Luxen
32c1fd082d fix build for tools 2013-10-21 12:01:19 +02:00
Dennis Luxen
175112d97d fix status messages during configure 2013-10-16 11:58:29 +02:00
Dennis Luxen
ffc361406e move git descriptor into a static library that is linked against all tools 2013-10-15 18:28:14 +02:00
Dennis Luxen
eaaf54d886 make C++11 default on OS X 2013-10-15 14:35:35 +02:00
Dennis Luxen
4b3d634fe9 always compile with C++11 on OS X (Linux to follow) 2013-10-15 14:35:35 +02:00
Dennis Luxen
204dcecb28 fixing typo in build configuration 2013-10-15 14:32:44 +02:00
Dennis Luxen
e05193f46d osrm-datastore handles manangement of shared memory 2013-10-15 14:32:42 +02:00
Dennis Luxen
2c23a3c0b3 link against proper objects 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
d42920674a compile with -std=c++11 on os x 10.9 2013-10-14 17:21:40 +02:00
Dennis Luxen
c66fced161 rename createhierarchy.cpp to more canonical name 2013-10-14 17:03:46 +02:00
DennisOSRM
f73723f9af link simple client against git descriptor 2013-10-12 15:20:32 +02:00
Emil Tin
613e38d7f8 use boost program_options in osrm-prepare/routed 2013-10-12 09:59:42 +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
250eb20851 removing boost::chrono timers 2013-09-05 21:33:10 +02:00
Dennis Luxen
71ae5764cc add boost timer library 2013-09-05 12:18:37 +02:00
Dennis Luxen
8a008d1808 new hard disk benchmark tool 2013-09-04 12:30:16 +02:00
Dennis Luxen
d0db09cb92 Adds Vlad's patch from issue #709 2013-08-20 13:17:19 +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
3167d3f451 Export compile commands 2013-08-14 11:57:33 +02:00
Dennis Luxen
3151197471 boost timer library not needed 2013-08-06 16:50:20 +02:00
Dennis Luxen
e5f0ad4f0b Use boost timer to provide platform independent timing 2013-08-06 14:27:36 +02:00
Dennis Luxen
bf0b43aa24 Platform specific linker flags 2013-07-23 11:49:23 +02:00
Dennis Luxen
811d6deb41 Don't link against LuaJIT on OS X 2013-07-23 11:38:15 +02:00
Dennis Luxen
bcdd9374c7 Compile fixes on OS X 2013-07-23 10:18:42 +02:00
DennisOSRM
f70174d1d1 Link internal tools against UUID 2013-07-22 17:54:04 +02:00
DennisOSRM
31fbfa3a70 Link against UUID 2013-07-19 18:05:15 +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
61c2ea9225 Trigger rebuild of fingerprint everytime 2013-07-19 14:53:47 +02:00
DennisOSRM
f5f7269f70 Trigger rebuild of fingerprint everytime 2013-07-19 14:38:12 +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
129a846393 add bit size to config object 2013-07-17 15:27:38 +02:00
DennisOSRM
15308931e9 (partially) adding new fingerprint objects 2013-07-17 14:47:22 +02:00
DennisOSRM
51a7d3ff50 merge conflict CMakeLists.txt 2013-07-09 13:38:44 +02:00
DennisOSRM
7ebe6de022 Proper check for luajit 2013-07-03 13:46:55 +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
4194ce3095 Moving cli client to tools directory 2013-06-27 16:08:33 -04:00
Dennis Luxen
a0e9f59e04 Adding a simple example on how to call the lib 2013-06-27 13:21:33 -04:00
Dennis Luxen
63d8abe32f First implementation of moving the algorithmic core into a library 2013-06-26 19:48:22 -04:00
Dennis Luxen
dc2c7d5339 De-template-izing some of the code for faster (re-)compile 2013-06-24 14:12:08 -04:00
Dane Springmeyer
19f1110421 fix spelling error and lacking boost header includes 2013-05-14 20:09:18 -07:00
Dennis Luxen
8d2396b81f Additional settings for OS X build without warnings 2013-05-12 18:49:14 -04:00
Dennis Luxen
d52d86ae82 Manually merging cmake support 2013-04-22 22:23:53 +02:00