@@ -17,8 +17,10 @@ if (NOT TARGET ${nSpace}libzmq AND NOT TARGET ${nSpace}libzmq-static)
1717 if (COMMAND xpFindPkg)
1818 xpFindPkg (PKGS libzmq )
1919 set (ZeroMQ_FOUND TRUE )
20+ set (installTargets cppzmq-static)
2021 else ()
2122 find_package (ZeroMQ QUIET )
23+ set (installTargets cppzmq cppzmq-static)
2224 endif ()
2325
2426 # libzmq autotools install: fallback to pkg-config
@@ -69,24 +71,27 @@ target_link_libraries(cppzmq-static INTERFACE ${nSpace}libzmq-static)
6971include (GNUInstallDirs )
7072include (CMakePackageConfigHelpers )
7173
72- install (TARGETS cppzmq cppzmq-static
74+ if (NOT DEFINED XP_INSTALL_CMAKEDIR)
75+ set (XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR} /cmake)
76+ endif ()
77+ set (targetsFile ${PROJECT_NAME } Targets)
78+ xpPackageDevel (TARGETS_FILE ${targetsFile} LIBRARIES ${nSpace} cppzmq-static )
79+
80+ install (TARGETS ${installTargets}
7381 EXPORT ${PROJECT_NAME } -targets )
7482
7583install (FILES ${CPPZMQ_HEADERS}
7684 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
7785
7886# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
79- if (NOT DEFINED XP_INSTALL_CMAKEDIR)
80- set (XP_INSTALL_CMAKEDIR share/cmake/${PROJECT_NAME } )
81- endif ()
8287set (CPPZMQ_CMAKECONFIG_INSTALL_DIR "${XP_INSTALL_CMAKEDIR} " CACHE STRING "install path for cppzmqConfig.cmake" )
8388
8489configure_file (libzmq-pkg-config/FindZeroMQ.cmake
8590 libzmq-pkg-config/FindZeroMQ.cmake
8691 COPYONLY )
8792
8893export (EXPORT ${PROJECT_NAME } -targets
89- FILE "${CMAKE_CURRENT_BINARY_DIR } /${PROJECT_NAME } Targets .cmake" )
94+ FILE "${CMAKE_CURRENT_BINARY_DIR } /${targetsFile} .cmake" )
9095configure_package_config_file (${PROJECT_NAME } Config.cmake.in
9196 "${CMAKE_CURRENT_BINARY_DIR } /${PROJECT_NAME } Config.cmake"
9297 INSTALL_DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR} )
@@ -103,13 +108,15 @@ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Conf
103108set (CMAKE_SIZEOF_VOID_P ${CPPZMQ_SIZEOF_VOID_P} )
104109
105110install (EXPORT ${PROJECT_NAME } -targets
106- FILE ${PROJECT_NAME } Targets .cmake ${nameSpace}
111+ FILE ${targetsFile} .cmake ${nameSpace}
107112 DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR} )
113+ if (NOT DEFINED XP_NAMESPACE)
108114install (FILES ${CMAKE_CURRENT_BINARY_DIR } /${PROJECT_NAME } Config.cmake
109115 ${CMAKE_CURRENT_BINARY_DIR } /${PROJECT_NAME } ConfigVersion.cmake
110116 DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR} )
111117install (FILES ${CMAKE_CURRENT_SOURCE_DIR } /libzmq-pkg-config/FindZeroMQ.cmake
112118 DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR} /libzmq-pkg-config)
119+ endif ()
113120
114121option (CPPZMQ_BUILD_TESTS "Whether or not to build the tests" ON )
115122
0 commit comments