Merge lp:~vanvugt/compiz-core/fix-919922 into lp:compiz-core/0.9.5

[Daniel van Vugt]

Bump the core ABI version, and enforce ABI matching when linking -lcompiz_core
so that it is impossible to get a core ABI mismatch in future. (LP: #919922)

(Impossible for any binary that is linked with -lcompiz_core)

[Daniel van Vugt (vanvugt)]

Ideally, eventually, compiz should follow the industry convention of using its major version number as the ABI/API identifier. But first compiz needs to stabilize and stop changing so much.

=== modified file 'include/core/abiversion.h'
--- include/core/abiversion.h	2012-01-18 16:26:45 +0000
+++ include/core/abiversion.h	2012-01-23 10:06:24 +0000
@@ -5,6 +5,6 @@
 #  error Conflicting definitions of CORE_ABIVERSION
 #endif
 
-#define CORE_ABIVERSION 20110828
+#define CORE_ABIVERSION 20120123
 
 #endif // COMPIZ_ABIVERSION_H

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-23 05:44:19 +0000
+++ src/CMakeLists.txt	2012-01-23 10:06:24 +0000
@@ -104,6 +104,18 @@
     ${_bcop_sources}
 )
 
+#
+# Normal libraries use the major version number of the library as their
+# ABI version. But compiz uses funky date numbers for ABI revisions instead.
+#
+set (abiversion_h "${compiz_SOURCE_DIR}/include/core/abiversion.h")
+file (STRINGS ${abiversion_h} abiline REGEX "^#define +CORE_ABIVERSION .+$")
+string (REGEX REPLACE "#define +CORE_ABIVERSION +" "" abiversion "${abiline}")
+set_target_properties (compiz_core PROPERTIES
+    VERSION ${VERSION}
+    SOVERSION "ABI-${abiversion}"
+)
+
 add_executable (compiz
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )