Skip to content

Commit e781482

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
@@ -855,6 +855,7 @@ set_target_properties (qpidcommon PROPERTIES
855855
SOVERSION ${qpidcommon_version_major})
856856

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

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

941943
install (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})
10081011
install (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
13111315
set(QPIDTYPESLIBDEBUG ${CMAKE_SHARED_LIBRARY_PREFIX}qpidtypes${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
13121316
endif ()
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)
13161335
install (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})

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)