generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-04-02 09:49:45 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #178 from minrk/rm-duplicate-find

Browse Source 
fix updated FindZeroMQ
This commit is contained in:
Luca Boccassi 2018-01-15 19:24:23 +00:00 committed by GitHub
commit e2f91c06f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -58,7 +58,6 @@ install(EXPORT ${PROJECT_NAME}-targets
DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}) DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake
DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}) DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
install(FILES ${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake install(FILES ${CMAKE_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake
DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}/libzmq-pkg-config) DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}/libzmq-pkg-config)

3
cppzmqConfig.cmake.in
View File

@ -21,7 +21,8 @@ find_package(ZeroMQ QUIET)
# libzmq autotools install: fallback to pkg-config # libzmq autotools install: fallback to pkg-config
if(NOT ZeroMQ_FOUND) 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() endif()
if(NOT ZeroMQ_FOUND) if(NOT ZeroMQ_FOUND)