From 4de64a92cb09bad75cfa43251d942dd022a63893 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 25 May 2016 09:32:27 -0400 Subject: [PATCH] fix zlib linking order --- CMakeLists.txt | 3 ++- unit_tests/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4369d1f68..4edfffda0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -316,7 +316,8 @@ set(ENGINE_LIBRARIES ${STXXL_LIBRARY} ${TBB_LIBRARIES} ${MAYBE_RT_LIBRARY} - ${MAYBE_COVERAGE_LIBRARIES}) + ${MAYBE_COVERAGE_LIBRARIES} + ${ZLIB_LIBRARY}) set(STORAGE_LIBRARIES ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt index 9ed2cc838..637190415 100644 --- a/unit_tests/CMakeLists.txt +++ b/unit_tests/CMakeLists.txt @@ -67,7 +67,7 @@ target_include_directories(util-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(engine-tests ${ENGINE_LIBRARIES} ${BoostUnitTestLibrary}) target_link_libraries(extractor-tests ${EXTRACTOR_LIBRARIES} ${BoostUnitTestLibrary}) target_link_libraries(library-tests osrm ${Boost_LIBRARIES} ${BoostUnitTestLibrary}) -target_link_libraries(server-tests osrm ${Boost_LIBRARIES} ${BoostUnitTestLibrary} ${ZLIB_LIBRARY}) +target_link_libraries(server-tests osrm ${Boost_LIBRARIES} ${BoostUnitTestLibrary}) target_link_libraries(util-tests ${UTIL_LIBRARIES} ${BoostUnitTestLibrary})