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

List:       kde-commits
Subject:    [baloo] /: Add version name
From:       Montel Laurent <montel () kde ! org>
Date:       2014-02-26 6:12:21
Message-ID: E1WIXjB-00063F-JG () scm ! kde ! org
[Download RAW message or body]

Git commit 517c78e69b784d457a7897d81d9f187f92da9953 by Montel Laurent.
Committed on 26/02/2014 at 06:12.
Pushed by mlaurent into branch 'master'.

Add version name

M  +7    -0    BalooConfig.cmake.in
M  +12   -1    CMakeLists.txt
M  +2    -2    src/core/CMakeLists.txt
M  +2    -2    src/file/lib/CMakeLists.txt
M  +2    -2    src/pim/lib/CMakeLists.txt
M  +2    -2    src/xapian/CMakeLists.txt

http://commits.kde.org/baloo/517c78e69b784d457a7897d81d9f187f92da9953

diff --git a/BalooConfig.cmake.in b/BalooConfig.cmake.in
index ef4e58e..308e4b4 100644
--- a/BalooConfig.cmake.in
+++ b/BalooConfig.cmake.in
@@ -7,6 +7,13 @@
 get_filename_component(_currentDir ${CMAKE_CURRENT_LIST_FILE} PATH) # The =
current directory
 get_filename_component(rootDir ${_currentDir}/@relInstallDir@ ABSOLUTE) # =
The install prefix
 =

+# The library version
+set(BALOO_VERSION_MAJOR @BALOO_VERSION_MAJOR@)
+set(BALOO_VERSION_MINOR @BALOO_VERSION_MINOR@)
+set(BALOO_VERSION_RELEASE @BALOO_VERSION_RELEASE@)
+set(BALOO_VERSION ${BALOO_VERSION_MAJOR}.${BALOO_VERSION_MINOR}.${BALOO_VE=
RSION_RELEASE})
+
+
 # Include directory
 set(BALOO_INSTALL_PREFIX "${rootDir}")
 set(BALOO_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9be10f..f9140bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,11 @@
 project(baloo)
 =

+set(BALOO_VERSION_MAJOR 4)
+set(BALOO_VERSION_MINOR 12)
+set(BALOO_VERSION_RELEASE 80)
+set(BALOO_VERSION "${BALOO_VERSION_MAJOR}.${BALOO_VERSION_MINOR}.${BALOO_V=
ERSION_RELEASE}")
+
+
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_P=
ATH})
 =

 find_package(KDE4 REQUIRED)
@@ -67,7 +73,12 @@ add_subdirectory(icons)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BalooConfig.cmake.in
                ${CMAKE_CURRENT_BINARY_DIR}/BalooConfig.cmake @ONLY)
 =

-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/BalooConfig.cmake
+# this file is used by to check if the installed version can be used.
+macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/BalooConf=
igVersion.cmake
+                                     ${BALOO_VERSION_MAJOR} ${BALOO_VERSIO=
N_MINOR} ${BALOO_VERSION_RELEASE})
+
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/BalooConfig.cmake ${CMAKE_CURREN=
T_BINARY_DIR}/BalooConfigVersion.cmake
         DESTINATION ${LIB_INSTALL_DIR}/cmake/Baloo)
 install(EXPORT BalooLibraryTargets
         DESTINATION ${LIB_INSTALL_DIR}/cmake/Baloo
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 5e766e6..b0a8642 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -19,8 +19,8 @@ target_link_libraries(baloocore
 )
 =

 set_target_properties(baloocore PROPERTIES
-    VERSION ${GENERIC_LIB_VERSION}
-    SOVERSION ${GENERIC_LIB_SOVERSION}
+    VERSION ${BALOO_VERSION}
+    SOVERSION ${BALOO_VERSION_MAJOR}
 )
 =

 install(TARGETS baloocore EXPORT BalooLibraryTargets ${INSTALL_TARGETS_DEF=
AULT_ARGS})
diff --git a/src/file/lib/CMakeLists.txt b/src/file/lib/CMakeLists.txt
index 718d3b5..0760b17 100644
--- a/src/file/lib/CMakeLists.txt
+++ b/src/file/lib/CMakeLists.txt
@@ -28,8 +28,8 @@ target_link_libraries(baloofiles
 )
 =

 set_target_properties(baloofiles PROPERTIES
-    VERSION ${GENERIC_LIB_VERSION}
-    SOVERSION ${GENERIC_LIB_SOVERSION}
+    VERSION ${BALOO_VERSION}
+    SOVERSION ${BALOO_VERSION_MAJOR}
 )
 =

 install(TARGETS baloofiles ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/pim/lib/CMakeLists.txt b/src/pim/lib/CMakeLists.txt
index 1561b8e..3f44533 100644
--- a/src/pim/lib/CMakeLists.txt
+++ b/src/pim/lib/CMakeLists.txt
@@ -26,8 +26,8 @@ target_link_libraries(baloopim
 )
 =

 set_target_properties(baloopim PROPERTIES
-    VERSION ${GENERIC_LIB_VERSION}
-    SOVERSION ${GENERIC_LIB_SOVERSION}
+    VERSION ${BALOO_VERSION}
+    SOVERSION ${BALOO_VERSION_MAJOR}
 )
 =

 install(TARGETS baloopim EXPORT BalooLibraryTargets ${INSTALL_TARGETS_DEFA=
ULT_ARGS})
diff --git a/src/xapian/CMakeLists.txt b/src/xapian/CMakeLists.txt
index c8f2a47..4cf037d 100644
--- a/src/xapian/CMakeLists.txt
+++ b/src/xapian/CMakeLists.txt
@@ -15,8 +15,8 @@ target_link_libraries(balooxapian
 )
 =

 set_target_properties(balooxapian PROPERTIES
-    VERSION ${GENERIC_LIB_VERSION}
-    SOVERSION ${GENERIC_LIB_SOVERSION}
+    VERSION ${BALOO_VERSION}
+    SOVERSION ${BALOO_VERSION_MAJOR}
 )
 =

 install(TARGETS balooxapian EXPORT BalooLibraryTargets ${INSTALL_TARGETS_D=
EFAULT_ARGS})
[prev in list] [next in list] [prev in thread] [next in thread]