Skip to content

Commit e2f91c0

Browse files
authored
Merge pull request #178 from minrk/rm-duplicate-find
fix updated FindZeroMQ
2 parents 6aa3ab6 + 8b92cb8 commit e2f91c0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ install(EXPORT ${PROJECT_NAME}-targets
5858
DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
5959
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
6060
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
61-
${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake
6261
DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
6362
install(FILES ${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake
6463
DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}/libzmq-pkg-config)

cppzmqConfig.cmake.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ find_package(ZeroMQ QUIET)
2121

2222
# libzmq autotools install: fallback to pkg-config
2323
if(NOT ZeroMQ_FOUND)
24-
include(${CMAKE_CURRENT_LIST_DIR}/libzmqPkgConfigFallback.cmake)
24+
list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
25+
find_package(ZeroMQ REQUIRED)
2526
endif()
2627

2728
if(NOT ZeroMQ_FOUND)

0 commit comments

Comments
 (0)