fix build for tools

This commit is contained in:
Dennis Luxen 2013-10-21 12:01:19 +02:00
parent 363bf42b95
commit 32c1fd082d
2 changed files with 7 additions and 6 deletions

View File

@ -169,11 +169,11 @@ if(WITH_TOOLS)
add_executable(osrm-components Tools/componentAnalysis.cpp)
include_directories(${GDAL_INCLUDE_DIR})
target_link_libraries(
osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES} UUID
osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES} UUID GITDESCRIPTION
)
endif(GDAL_FOUND)
add_executable ( osrm-cli Tools/simpleclient.cpp)
target_link_libraries( osrm-cli ${Boost_LIBRARIES} OSRM UUID )
target_link_libraries( osrm-cli ${Boost_LIBRARIES} OSRM UUID GITDESCRIPTION )
add_executable ( osrm-io-benchmark Tools/io-benchmark.cpp )
target_link_libraries( osrm-io-benchmark ${Boost_LIBRARIES} )
target_link_libraries( osrm-io-benchmark ${Boost_LIBRARIES} GITDESCRIPTION)
endif(WITH_TOOLS)

View File

@ -55,7 +55,7 @@ int main (int argc, const char * argv[]) {
try {
std::string ip_address;
int ip_port, requested_num_threads;
bool use_shared_memory = false;
ServerPaths server_paths;
if( !GenerateServerProgramOptions(
argc,
@ -63,7 +63,8 @@ int main (int argc, const char * argv[]) {
server_paths,
ip_address,
ip_port,
requested_num_threads
requested_num_threads,
use_shared_memory
)
) {
return 0;
@ -73,7 +74,7 @@ int main (int argc, const char * argv[]) {
"starting up engines, " << g_GIT_DESCRIPTION << ", " <<
"compiled at " << __DATE__ << ", " __TIME__;
OSRM routing_machine(server_paths);
OSRM routing_machine( server_paths, use_shared_memory );
RouteParameters route_parameters;
route_parameters.zoomLevel = 18; //no generalization