summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2012-04-05 13:28:54 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2012-04-05 13:28:54 +0000
commitb09cd38b087ed9b2288de1bb85dded9ff48ee8a8 (patch)
tree6d307b810509417c2b87d5472f936f5cca8547d0
parentda453218a41318f174075fa031da55fd1c710a90 (diff)
[1.5] introduce fix for the SOVERSION regression introduced in 1.5.0
-rw-r--r--CMakeLists.txt19
1 files changed, 18 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 134f91d7..7e222e24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,9 +34,26 @@ SET(OPENJPEG_VERSION
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
SET(PACKAGE_VERSION
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
+
+# Because autotools does not support X.Y notation for SOVERSION, we have to use
+# two numerorations, one for the openjpeg version and one for openjpeg soversion
+# version | soversion
+# 1.0 |  0
+# 1.1 |  1
+# 1.2 |  2
+# 1.3 |  3
+# 1.4 |  4
+# 1.5 |  5
+# 2.0 | 6
+# above is the recommendation by the OPJ team. If you really need to override this default,
+# you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
+# cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
+if(NOT OPENJPEG_SOVERSION)
+ SET(OPENJPEG_SOVERSION 5)
+endif(NOT OPENJPEG_SOVERSION)
SET(OPENJPEG_LIBRARY_PROPERTIES
VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
- SOVERSION "${OPENJPEG_VERSION_MAJOR}"
+ SOVERSION "${OPENJPEG_SOVERSION}"
)
# --------------------------------------------------------------------------