[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2008-06-27 17:11:49
Message-ID: 1214586709.034789.4516.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 825248 by helio:

- Both of qgpgme and gpgme++ are lacking of proper soversion. Using version == \
soversion was dificult fot distros packaging kde and splitting libraries.


 M  +6 -5      gpgme++/CMakeLists.txt  
 M  +5 -2      qgpgme/CMakeLists.txt  


--- trunk/KDE/kdepimlibs/gpgme++/CMakeLists.txt #825247:825248
@@ -33,6 +33,7 @@
 )
 
 set( _gpgmepp_version 2.0.0 )
+set( _gpgmepp_soversion 2 )
 
 set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
 
@@ -41,7 +42,7 @@
    target_link_libraries( gpgmepp ${GPGME_VANILLA_LIBRARIES} )
    set_target_properties( gpgmepp PROPERTIES
                                   VERSION     ${_gpgmepp_version}
-                                  SOVERSION   ${_gpgmepp_version}
+                                  SOVERSION   ${_gpgmepp_soversion}
                                   OUTPUT_NAME gpgme++
    )
    get_target_property( GPGMEPP_VANILLA_LIBRARY gpgmepp LOCATION )
@@ -53,7 +54,7 @@
    target_link_libraries( gpgmepp-glib ${GPGME_GLIB_LIBRARIES} )
    set_target_properties( gpgmepp-glib PROPERTIES
                                        VERSION     ${_gpgmepp_version}
-                                       SOVERSION   ${_gpgmepp_version}
+                                       SOVERSION   ${_gpgmepp_soversion}
                                        OUTPUT_NAME gpgme++-glib DEFINE_SYMBOL \
MAKE_GPGME___LIB  )
    get_target_property( GPGMEPP_GLIB_LIBRARY gpgmepp LOCATION )
@@ -69,7 +70,7 @@
    endif(WIN32)
    set_target_properties( gpgmepp-qt PROPERTIES
                                      VERSION     ${_gpgmepp_version}
-                                     SOVERSION   ${_gpgmepp_version}
+                                     SOVERSION   ${_gpgmepp_soversion}
                                      OUTPUT_NAME gpgme++-qt DEFINE_SYMBOL \
MAKE_GPGME___LIB  )
    get_target_property( GPGMEPP_QT_LIBRARY gpgmepp LOCATION )
@@ -82,7 +83,7 @@
    target_link_libraries( gpgmepp-pthread ${GPGME_PTHREAD_LIBRARIES} )
    set_target_properties( gpgmepp-pthread PROPERTIES
                                           VERSION     ${_gpgmepp_version}
-                                          SOVERSION   ${_gpgmepp_version}
+                                          SOVERSION   ${_gpgmepp_soversion}
                                           OUTPUT_NAME gpgme++-pthread DEFINE_SYMBOL \
MAKE_GPGME___LIB  )
    get_target_property( GPGMEPP_PTHREAD_LIBRARY gpgmepp LOCATION )
@@ -94,7 +95,7 @@
    target_link_libraries( gpgmepp-pth ${GPGME_PTH_LIBRARIES} )
    set_target_properties( gpgmepp-pth PROPERTIES
                                       VERSION     ${_gpgmepp_version}
-                                      SOVERSION   ${_gpgmepp_version}
+                                      SOVERSION   ${_gpgmepp_soversion}
                                       OUTPUT_NAME gpgme++-pth DEFINE_SYMBOL \
MAKE_GPGME___LIB  )
    get_target_property( GPGMEPP_PTH_LIBRARY gpgmepp LOCATION )
--- trunk/KDE/kdepimlibs/qgpgme/CMakeLists.txt #825247:825248
@@ -1,6 +1,9 @@
 
 set( _any_gpgme_found false )
 
+set( _qgpgme_version 1.0.1 )
+set( _qgpgme_soversion 1 )
+
 if ( WIN32 AND GPGME_VANILLA_FOUND )
 
    # on Windows, we require gpgme(-vanilla), which is thread-safe,
@@ -43,8 +46,8 @@
    target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} ${_qgpgme_libgpgme} )
 
    set_target_properties( qgpgme PROPERTIES
-     VERSION   1.0.1
-     SOVERSION 1.0.1
+     VERSION ${_qgpgme_version}
+     SOVERSION ${_qgpgme_soversion}
    )
 
    install( TARGETS qgpgme ${INSTALL_TARGETS_DEFAULT_ARGS})


[prev in list] [next in list] [prev in thread] [next in thread]