From cb37c0d135d724d58fe1e295352b4b46d6d0d2d3 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Wed, 6 Jan 2016 12:32:19 +0100 Subject: [PATCH] Use FindOsmium.cmake to handle libosmium's buildsystem integration --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c64c5d978..518d4fac5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,6 @@ option(BUILD_TOOLS "Build OSRM tools" OFF) include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/) include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/) -include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/) add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND} "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}" @@ -226,7 +225,14 @@ if(UNIX AND NOT APPLE) target_link_libraries(engine-tests rt) endif() -#Check Boost +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/cmake") +set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include") +find_package(Osmium REQUIRED COMPONENTS io) +include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS}) + +target_link_libraries(osrm-extract ${OSMIUM_LIBRARIES}) +target_link_libraries(extractor-tests ${OSMIUM_LIBRARIES}) + find_package(Boost 1.49.0 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) if(NOT Boost_FOUND) message(FATAL_ERROR "Fatal error: Boost (version >= 1.49.0) required.\n")