[Digikam-devel] [digikam] [Bug 339180] cmake and/or compiler pick up libkgeomap header files from previous version

[Gilles Caulier]

https://bugs.kde.org/show_bug.cgi?id=339180

--- Comment #21 from Gilles Caulier <caulier.gilles at gmail.com> ---
Git commit f20e21b1d45a0eef9fcddd3c9e852c28cc112337 by Gilles Caulier.
Committed on 02/11/2014 at 22:46.
Pushed by cgilles into branch 'master'.

since TrackManager have been introduced this summer, lib version ID have never
been dumped.
Fix API/ABI id accordingly

M  +5    -4    CMakeLists.txt

http://commits.kde.org/libkgeomap/f20e21b1d45a0eef9fcddd3c9e852c28cc112337

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc25499..862bb98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,9 +62,10 @@
ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=${LIBKGEOMAP_AREA_CODE_GENERAL})
 # API      ABI
 # 0.1.0 => 0.1.0     (During digiKam GoSC2010)
 # 2.0.0 => 1.0.0     (Included into digiKam 2.0.0 Software Collection)
+# 3.0.0 => 2.0.0     (Including track manager, see bug #333622)

 # Library API version
-SET(KGEOMAP_LIB_MAJOR_VERSION "2")
+SET(KGEOMAP_LIB_MAJOR_VERSION "3")
 SET(KGEOMAP_LIB_MINOR_VERSION "0")
 SET(KGEOMAP_LIB_PATCH_VERSION "0")

@@ -79,15 +80,15 @@ SET(KGEOMAP_LIB_SUFFIX_VERSION "")

 # Library ABI version used by linker.
 # For details :
http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-SET(KGEOMAP_LIB_SO_CUR_VERSION "1")
+SET(KGEOMAP_LIB_SO_CUR_VERSION "2")
 SET(KGEOMAP_LIB_SO_REV_VERSION "0")
 SET(KGEOMAP_LIB_SO_AGE_VERSION "0")

 # =======================================================
 # Set env. variables accordinly.

-SET(KGEOMAP_LIB_VERSION_STRING
"${KGEOMAP_LIB_MAJOR_VERSION}.${KGEOMAP_LIB_MINOR_VERSION}.${KGEOMAP_LIB_PATCH_VERSION}${KGEOMAP_LIB_SUFFIX_VERSION}")
-SET(KGEOMAP_LIB_VERSION_ID
"0x0${KGEOMAP_LIB_MAJOR_VERSION}0${KGEOMAP_LIB_MINOR_VERSION}0${KGEOMAP_LIB_PATCH_VERSION}")
+SET(KGEOMAP_LIB_VERSION_STRING   
"${KGEOMAP_LIB_MAJOR_VERSION}.${KGEOMAP_LIB_MINOR_VERSION}.${KGEOMAP_LIB_PATCH_VERSION}${KGEOMAP_LIB_SUFFIX_VERSION}")
+SET(KGEOMAP_LIB_VERSION_ID       
"0x0${KGEOMAP_LIB_MAJOR_VERSION}0${KGEOMAP_LIB_MINOR_VERSION}0${KGEOMAP_LIB_PATCH_VERSION}")
 SET(KGEOMAP_LIB_SO_VERSION_STRING
"${KGEOMAP_LIB_SO_CUR_VERSION}.${KGEOMAP_LIB_SO_REV_VERSION}.${KGEOMAP_LIB_SO_AGE_VERSION}")

 # =======================================================

-- 
You are receiving this mail because:
You are the assignee for the bug.