@@ -861,6 +861,7 @@ set_target_properties (qpidcommon PROPERTIES
861861 SOVERSION ${qpidcommon_version_major} )
862862
863863install (TARGETS qpidcommon
864+ EXPORT QpidTargets
864865 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_COMMON}
865866 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}
866867 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON} )
@@ -886,6 +887,7 @@ set_target_properties (qpidtypes PROPERTIES
886887 SOVERSION ${qpidtypes_version_major} )
887888
888889install (TARGETS qpidtypes
890+ EXPORT QpidTargets
889891 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_COMMON}
890892 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}
891893 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON} )
@@ -944,6 +946,7 @@ set_target_properties (qpidclient PROPERTIES
944946 SOVERSION ${qpidclient_version_major} )
945947
946948install (TARGETS qpidclient
949+ EXPORT QpidTargets
947950 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
948951 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
949952 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT} )
@@ -1011,6 +1014,7 @@ set_target_properties (qpidmessaging PROPERTIES
10111014 VERSION ${qpidmessaging_version}
10121015 SOVERSION ${qpidmessaging_version_major} )
10131016install (TARGETS qpidmessaging
1017+ EXPORT QpidTargets
10141018 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
10151019 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
10161020 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT} )
@@ -1315,11 +1319,25 @@ set(QPIDTYPESLIB ${CMAKE_SHARED_LIBRARY_PREFIX}qpidtypes${CMAKE_SHARED_LIBRARY_S
13151319set (QPIDTYPESLIBDEBUG ${CMAKE_SHARED_LIBRARY_PREFIX} qpidtypes${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} )
13161320endif ()
13171321
1318- configure_file (QpidConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR} /QpidConfig.cmake @ONLY)
1319- configure_file (QpidConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR} /QpidConfigVersion.cmake @ONLY)
1322+ install (EXPORT QpidTargets
1323+ FILE QpidTargets.cmake
1324+ NAMESPACE Qpid::
1325+ DESTINATION ${QPID_INSTALL_LIBDIR} /cmake/Qpid)
1326+
1327+ include (CMakePackageConfigHelpers)
1328+ include (WriteBasicConfigVersionFile)
1329+
1330+ configure_package_config_file(
1331+ ${CMAKE_CURRENT_SOURCE_DIR} /QpidConfig.cmake.in
1332+ ${CMAKE_CURRENT_BINARY_DIR} /QpidConfig.cmake
1333+ PATH_VARS includedir
1334+ INSTALL_DESTINATION ${QPID_INSTALL_LIBDIR} /cmake/Qpid)
1335+ write_basic_config_version_file(
1336+ ${CMAKE_CURRENT_BINARY_DIR} /QpidConfigVersion.cmake
1337+ VERSION ${VERSION}
1338+ COMPATIBILITY AnyNewerVersion)
13201339install (FILES
1321- ${CMAKE_CURRENT_BINARY_DIR} /QpidConfig.cmake
1322- ${CMAKE_CURRENT_BINARY_DIR} /QpidConfigVersion.cmake
1323- DESTINATION ${QPID_INSTALL_LIBDIR} /cmake/Qpid
1324- COMPONENT ${QPID_COMPONENT_COMMON} )
1325-
1340+ ${CMAKE_CURRENT_BINARY_DIR} /QpidConfig.cmake
1341+ ${CMAKE_CURRENT_BINARY_DIR} /QpidConfigVersion.cmake
1342+ DESTINATION ${QPID_INSTALL_LIBDIR} /cmake/Qpid
1343+ COMPONENT ${QPID_COMPONENT_COMMON} )
0 commit comments