Author: mcpierce Date: Fri May 10 08:21:47 2013 New Revision: 1480927 URL: http://svn.apache.org/r1480927 Log: QPID-4825: Add SOVERSION link to shared libraries
Contributed by Irina Boverman <[email protected]> Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt qpid/trunk/qpid/cpp/src/rdma.cmake qpid/trunk/qpid/cpp/src/ssl.cmake qpid/trunk/qpid/cpp/src/versions.cmake Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1480927&r1=1480926&r2=1480927&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original) +++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri May 10 08:21:47 2013 @@ -991,7 +991,8 @@ target_link_libraries (qpidcommon qpidty ${qpidcommon_platform_LIBS} ${qpidcommon_sasl_lib}) set_target_properties (qpidcommon PROPERTIES - VERSION ${qpidcommon_version}) + VERSION ${qpidcommon_version} + SOVERSION ${qpidcommon_version_major}) install (TARGETS qpidcommon DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}) @@ -1006,7 +1007,9 @@ set(qpidtypes_SOURCES add_msvc_version (qpidtypes library dll) add_library(qpidtypes SHARED ${qpidtypes_SOURCES}) target_link_libraries(qpidtypes ${qpidtypes_platform_LIBS}) -set_target_properties (qpidtypes PROPERTIES VERSION ${qpidtypes_version}) +set_target_properties (qpidtypes PROPERTIES + VERSION ${qpidtypes_version} + SOVERSION ${qpidtypes_version_major}) install(TARGETS qpidtypes DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}) @@ -1053,7 +1056,8 @@ add_msvc_version (qpidclient library dll add_library (qpidclient SHARED ${qpidclient_SOURCES}) target_link_libraries (qpidclient qpidcommon ${qpidclient_platform_LIBS}) -set_target_properties (qpidclient PROPERTIES VERSION ${qpidclient_version}) +set_target_properties (qpidclient PROPERTIES VERSION ${qpidclient_version} +SOVERSION ${qpidclient_version_major}) install (TARGETS qpidclient DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}) @@ -1120,7 +1124,9 @@ add_msvc_version (qpidmessaging library add_library (qpidmessaging SHARED ${qpidmessaging_SOURCES}) target_link_libraries (qpidmessaging qpidclient) -set_target_properties (qpidmessaging PROPERTIES VERSION ${qpidmessaging_version}) +set_target_properties (qpidmessaging PROPERTIES + VERSION ${qpidmessaging_version} + SOVERSION ${qpidmessaging_version_major}) install (TARGETS qpidmessaging DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}) @@ -1247,7 +1253,10 @@ set (qpidbroker_SOURCES add_msvc_version (qpidbroker library dll) add_library (qpidbroker SHARED ${qpidbroker_SOURCES}) target_link_libraries (qpidbroker qpidcommon ${qpidbroker_platform_LIBS}) -set_target_properties (qpidbroker PROPERTIES VERSION ${qpidbroker_version} COMPILE_DEFINITIONS _IN_QPID_BROKER) +set_target_properties (qpidbroker PROPERTIES + VERSION ${qpidbroker_version} + SOVERSION ${qpidbroker_version_major} + COMPILE_DEFINITIONS _IN_QPID_BROKER) if (MSVC) set_target_properties (qpidbroker PROPERTIES COMPILE_FLAGS /wd4290) endif (MSVC) @@ -1293,7 +1302,8 @@ add_msvc_version (qmf library dll) add_library (qmf SHARED ${qmf_SOURCES}) target_link_libraries (qmf qmfengine) set_target_properties (qmf PROPERTIES - VERSION ${qmf_version}) + VERSION ${qmf_version} + SOVERSION ${qmf_version_major}) install (TARGETS qmf OPTIONAL DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_QMF}) @@ -1374,7 +1384,8 @@ if(NOT WIN32) add_library (qmf2 SHARED ${qmf2_SOURCES}) target_link_libraries (qmf2 qpidmessaging qpidtypes qpidclient qpidcommon) set_target_properties (qmf2 PROPERTIES - VERSION ${qmf2_version}) + VERSION ${qmf2_version} + SOVERSION ${qmf2_version_major}) install (TARGETS qmf2 OPTIONAL DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_QMF}) @@ -1439,7 +1450,8 @@ add_msvc_version (qmfengine library dll) add_library (qmfengine SHARED ${qmfengine_SOURCES}) target_link_libraries (qmfengine qpidclient) set_target_properties (qmfengine PROPERTIES - VERSION ${qmfengine_version}) + VERSION ${qmfengine_version} + SOVERSION ${qmfengine_version_major}) install (TARGETS qmfengine OPTIONAL DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_QMF}) @@ -1477,7 +1489,8 @@ add_msvc_version (qmfconsole library dll add_library (qmfconsole SHARED ${qmfconsole_SOURCES}) target_link_libraries (qmfconsole qpidclient) set_target_properties (qmfconsole PROPERTIES - VERSION ${qmfconsole_version}) + VERSION ${qmfconsole_version} + SOVERSION ${qmfconsole_version_major}) install (TARGETS qmfconsole DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_QMF}) Modified: qpid/trunk/qpid/cpp/src/rdma.cmake URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/rdma.cmake?rev=1480927&r1=1480926&r2=1480927&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/rdma.cmake (original) +++ qpid/trunk/qpid/cpp/src/rdma.cmake Fri May 10 08:21:47 2013 @@ -66,7 +66,8 @@ if (BUILD_RDMA) target_link_libraries (rdmawrap qpidcommon rdmacm ibverbs) set_target_properties (rdmawrap PROPERTIES LINK_FLAGS "${CATCH_UNDEFINED}" - VERSION ${rdmawrap_version}) + VERSION ${rdmawrap_version} + SOVERSION ${rdmawrap_version_major}) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(rdmawrap PROPERTIES COMPILE_FLAGS -Wno-missing-field-initializers) Modified: qpid/trunk/qpid/cpp/src/ssl.cmake URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/ssl.cmake?rev=1480927&r1=1480926&r2=1480927&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/ssl.cmake (original) +++ qpid/trunk/qpid/cpp/src/ssl.cmake Fri May 10 08:21:47 2013 @@ -78,6 +78,7 @@ if (BUILD_SSL) target_link_libraries (sslcommon qpidcommon) set_target_properties (sslcommon PROPERTIES VERSION ${sslcommon_version} + SOVERSION ${sslcommon_version_major} COMPILE_FLAGS ${NSS_COMPILE_FLAGS} LINK_FLAGS -L${NSS_LIBDIR}) Modified: qpid/trunk/qpid/cpp/src/versions.cmake URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/versions.cmake?rev=1480927&r1=1480926&r2=1480927&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/versions.cmake (original) +++ qpid/trunk/qpid/cpp/src/versions.cmake Fri May 10 08:21:47 2013 @@ -36,3 +36,16 @@ set (qpidtypes_version 1.0.0) set (rdmawrap_version 2.0.0) set (sslcommon_version 2.0.0) set (legacystore_version 1.0.0) + +string(REGEX MATCH "[0-9]*" qmf_version_major ${qmf_version}) +string(REGEX MATCH "[0-9]*" qmf2_version_major ${qmf2_version}) +string(REGEX MATCH "[0-9]*" qmfconsole_version_major ${qmfconsole_version}) +string(REGEX MATCH "[0-9]*" qmfengine_version_major ${qmfengine_version}) +string(REGEX MATCH "[0-9]*" qpidbroker_version_major ${qpidbroker_version}) +string(REGEX MATCH "[0-9]*" qpidclient_version_major ${qpidclient_version}) +string(REGEX MATCH "[0-9]*" qpidcommon_version_major ${qpidcommon_version}) +string(REGEX MATCH "[0-9]*" qpidmessaging_version_major ${qpidmessaging_version}) +string(REGEX MATCH "[0-9]*" qpidtypes_version_major ${qpidtypes_version}) +string(REGEX MATCH "[0-9]*" rdmawrap_version_major ${rdmawrap_version}) +string(REGEX MATCH "[0-9]*" sslcommon_version_major ${sslcommon_version}) +string(REGEX MATCH "[0-9]*" legacystore_version_major ${legacystore_version}) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
