From 7174baa91e2035da07856363867e637966dd156d Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Wed, 30 Mar 2016 22:50:32 +0200 Subject: [PATCH] Move osrm-components to BUILD_COMPONENTS flag --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd3be2449..ef89e30d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,7 @@ endif() option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON) option(ENABLE_JSON_LOGGING "Adds additional JSON debug logging to the response" OFF) option(BUILD_TOOLS "Build OSRM tools" OFF) +option(BUILD_COMPONENTS "Build OSRM tools" ON) option(ENABLE_ASSERTIONS OFF) include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/) @@ -344,8 +345,7 @@ target_link_libraries(rtree-bench ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} $ target_link_libraries(util-tests ${UTIL_LIBRARIES}) target_link_libraries(library-tests osrm ${Boost_LIBRARIES}) -if(BUILD_TOOLS) - message(STATUS "Activating OSRM internal tools") +if(BUILD_COMPONENTS) find_package(GDAL) if(GDAL_FOUND) add_executable(osrm-components src/tools/components.cpp $) @@ -356,6 +356,10 @@ if(BUILD_TOOLS) else() message(WARNING "libgdal and/or development headers not found") endif() +endif() + +if(BUILD_TOOLS) + message(STATUS "Activating OSRM internal tools") add_executable(osrm-io-benchmark src/tools/io-benchmark.cpp $) target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES}) add_executable(osrm-unlock-all src/tools/unlock_all_mutexes.cpp $)