Skip to content

Commit f8ed352

Browse files

File tree

3 files changed

+33
-41
lines changed

3 files changed

+33
-41
lines changed

src/CMakeLists.txt

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,7 @@ set_target_properties (qpidcommon PROPERTIES
861861
SOVERSION ${qpidcommon_version_major})
862862

863863
install (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

888889
install(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

946948
install (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})
10131016
install (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
13151319
set(QPIDTYPESLIBDEBUG ${CMAKE_SHARED_LIBRARY_PREFIX}qpidtypes${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
13161320
endif ()
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)
13201339
install (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})

src/QpidConfig.cmake.in

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,21 @@
2222
# Version: @VERSION@
2323
# URL: http://qpid.apache.org/
2424

25-
set (Qpid_VERSION @VERSION@)
25+
@PACKAGE_INIT@
26+
include("${CMAKE_CURRENT_LIST_DIR}/QpidTargets.cmake")
2627

27-
set (Qpid_INCLUDE_DIRS @includedir@)
28-
set (Qpid_LIBRARIES optimized @libdir@/@QPIDMSGLIB@ @libdir@/@QPIDTYPESLIB@ debug @libdir@/@QPIDMSGLIBDEBUG@ @libdir@/@QPIDTYPESLIBDEBUG@)
28+
set(Qpid_VERSION @VERSION@)
29+
30+
set_and_check (Qpid_INCLUDE_DIRS @PACKAGE_includedir@)
31+
set (Qpid_LIBRARIES Qpid::qpidmessaging Qpid::qpidtypes)
2932

3033
# Can't make this compatible with CMake 2.8.12 as Qpid::qpid really is an interface target
31-
# (because it has multiple libraries). So only allow for later versions of CMake
34+
# (because it has multiple libraries). So only allow for later versions of CMake
3235
if (NOT TARGET Qpid::qpid AND CMAKE_VERSION VERSION_GREATER "3.0")
3336
add_library(Qpid::qpid INTERFACE IMPORTED)
3437
target_link_libraries(Qpid::qpid INTERFACE ${Qpid_LIBRARIES})
3538
target_include_directories(Qpid::qpid INTERFACE ${Qpid_INCLUDE_DIRS})
3639
endif()
3740

3841
set (Qpid_FOUND True)
42+
check_required_components(Qpid)

src/QpidConfigVersion.cmake.in

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)