From 8b92cb82aa6ca8fda09e5e68203acc579b677e48 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 15 Jan 2018 10:42:54 -0800 Subject: [PATCH] fix updated FindZeroMQ - remove duplicate top-level install - copy fallback code to cppzmqConfig.cmake.in --- CMakeLists.txt | 1 - cppzmqConfig.cmake.in | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfdadac..8386928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,6 @@ install(EXPORT ${PROJECT_NAME}-targets DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake - ${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}) install(FILES ${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}/libzmq-pkg-config) diff --git a/cppzmqConfig.cmake.in b/cppzmqConfig.cmake.in index 0b012fd..11d7a2c 100644 --- a/cppzmqConfig.cmake.in +++ b/cppzmqConfig.cmake.in @@ -21,7 +21,8 @@ find_package(ZeroMQ QUIET) # libzmq autotools install: fallback to pkg-config if(NOT ZeroMQ_FOUND) - include(${CMAKE_CURRENT_LIST_DIR}/libzmqPkgConfigFallback.cmake) + list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config) + find_package(ZeroMQ REQUIRED) endif() if(NOT ZeroMQ_FOUND)