mirror of
https://github.com/zeromq/cppzmq.git
synced 2025-04-01 01:16:54 +02:00
Merge pull request #178 from minrk/rm-duplicate-find
fix updated FindZeroMQ
This commit is contained in:
commit
e2f91c06f6
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user