@@ -855,6 +855,7 @@ set_target_properties (qpidcommon PROPERTIES
855855 SOVERSION ${qpidcommon_version_major} )
856856
857857install (TARGETS qpidcommon
858+ EXPORT QpidTargets
858859 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_COMMON}
859860 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}
860861 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON} )
@@ -880,6 +881,7 @@ set_target_properties (qpidtypes PROPERTIES
880881 SOVERSION ${qpidtypes_version_major} )
881882
882883install (TARGETS qpidtypes
884+ EXPORT QpidTargets
883885 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_COMMON}
884886 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}
885887 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON} )
@@ -939,6 +941,7 @@ set_target_properties (qpidclient PROPERTIES
939941 SOVERSION ${qpidclient_version_major} )
940942
941943install (TARGETS qpidclient
944+ EXPORT QpidTargets
942945 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
943946 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
944947 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT} )
@@ -1006,6 +1009,7 @@ set_target_properties (qpidmessaging PROPERTIES
10061009 VERSION ${qpidmessaging_version}
10071010 SOVERSION ${qpidmessaging_version_major} )
10081011install (TARGETS qpidmessaging
1012+ EXPORT QpidTargets
10091013 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
10101014 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
10111015 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT} )
@@ -1311,11 +1315,25 @@ set(QPIDTYPESLIB ${CMAKE_SHARED_LIBRARY_PREFIX}qpidtypes${CMAKE_SHARED_LIBRARY_S
13111315set (QPIDTYPESLIBDEBUG ${CMAKE_SHARED_LIBRARY_PREFIX} qpidtypes${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} )
13121316endif ()
13131317
1314- configure_file (QpidConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR} /QpidConfig.cmake @ONLY)
1315- configure_file (QpidConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR} /QpidConfigVersion.cmake @ONLY)
1318+ install (EXPORT QpidTargets
1319+ FILE QpidTargets.cmake
1320+ NAMESPACE Qpid::
1321+ DESTINATION ${QPID_INSTALL_LIBDIR} /cmake/Qpid)
1322+
1323+ include (CMakePackageConfigHelpers)
1324+ include (WriteBasicConfigVersionFile)
1325+
1326+ configure_package_config_file(
1327+ ${CMAKE_CURRENT_SOURCE_DIR} /QpidConfig.cmake.in
1328+ ${CMAKE_CURRENT_BINARY_DIR} /QpidConfig.cmake
1329+ PATH_VARS includedir
1330+ INSTALL_DESTINATION ${QPID_INSTALL_LIBDIR} /cmake/Qpid)
1331+ write_basic_config_version_file(
1332+ ${CMAKE_CURRENT_BINARY_DIR} /QpidConfigVersion.cmake
1333+ VERSION ${VERSION}
1334+ COMPATIBILITY AnyNewerVersion)
13161335install (FILES
1317- ${CMAKE_CURRENT_BINARY_DIR} /QpidConfig.cmake
1318- ${CMAKE_CURRENT_BINARY_DIR} /QpidConfigVersion.cmake
1319- DESTINATION ${QPID_INSTALL_LIBDIR} /cmake/Qpid
1320- COMPONENT ${QPID_COMPONENT_COMMON} )
1321-
1336+ ${CMAKE_CURRENT_BINARY_DIR} /QpidConfig.cmake
1337+ ${CMAKE_CURRENT_BINARY_DIR} /QpidConfigVersion.cmake
1338+ DESTINATION ${QPID_INSTALL_LIBDIR} /cmake/Qpid
1339+ COMPONENT ${QPID_COMPONENT_COMMON} )
0 commit comments