From 9d24a4422a6818cdd16e55c045767ac2b9ff29ca Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Tue, 1 Nov 2016 13:20:47 +0100 Subject: [PATCH] FindOsmium invoke is required for MSVC build dependencies The commit is aprtial revert of 87d09f7 | * make adjustments based on PR review from @themarex because osmium requires ws2_32 --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c91f06d2..0827bbc8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -457,7 +457,10 @@ endif() find_package(ZLIB REQUIRED) add_dependency_includes(${ZLIB_INCLUDE_DIRS}) -include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include) +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_DIR}) if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS) add_dependency_defines(-DBOOST_TEST_DYN_LINK)