The SWORD Project

Merge lp:~xnox/sword/soname into lp:~sword-devel/sword/trunk

  1. soname
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2490
Proposed branch: lp:~xnox/sword/soname
Merge into: lp:~sword-devel/sword/trunk
Diff against target: 18 lines (+8/-0)
1 file modified
CMakeLists.txt (+8/-0)
To merge this branch: bzr merge lp:~xnox/sword/soname
Reviewer Review Type Date Requested Status
Greg Hellings Approve
Review via email: mp+34020@code.launchpad.net

Description of the change

This is the SONAME branch. That I have emailed to you.

This sets soname to LIBSWORD_SOVERSION, and if not supplied fallsback to
SWORD_VERSION (typical case).

To post a comment you must log in.
Revision history for this message
Greg Hellings (greg-hellings) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 1970-01-01 00:00:00 +0000
3+++ CMakeLists.txt 2010-08-29 16:17:42 +0000
4@@ -90,6 +90,14 @@
5 # MESSAGE(ERROR "Please set library build type to either 'Static' or 'Shared'")
6 ENDIF(LIBSWORD_LIBRARY_TYPE STREQUAL "Shared")
7
8+IF(NOT LIBSWORD_SOVERSION)
9+ SET(SWORD_SOVERSION ${SWORD_VERSION})
10+ELSE(NOT LIBSWORD_SOVERSION)
11+ SET(SWORD_SOVERSION ${LIBSWORD_SOVERSION})
12+ENDIF(NOT LIBSWORD_SOVERSION)
13+SET_TARGET_PROPERTIES(sword
14+ PROPERTIES SOVERSION ${SWORD_SOVERSION})
15+
16 ###############################################################################################
17 # Some options are only needed if we're going to be building a debug option into the library
18 # These are generally only for developer building and testing

Subscribers

People subscribed via source and target branches

to all changes: