Define cynara's version in CMakeLists.txt

Version of cynara was previously defined in spec file.
Moving it to CMakeLists.txt will allow cynara to always know its version,
even if it is build manually with cmake.

Change-Id: Ie2ff6fa724d69021c6ec0079cd155f65f191eb1e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 513f103..3f91d6d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,8 @@ ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warni
 # Don't export symbols by default
 ADD_DEFINITIONS("-fvisibility=hidden")
 
+# Export version of cynara
+ADD_DEFINITIONS("-DCYNARA_VERSION=\"${CYNARA_VERSION}\"")
 
 IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
     ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")

diff --git a/packaging/cynara.spec b/packaging/cynara.spec
index 24f21d8..e9e389c 100644 (file)
--- a/packaging/cynara.spec
+++ b/packaging/cynara.spec
@@ -207,8 +207,7 @@ export CXXFLAGS="$CXXFLAGS -Wp,-U_FORTIFY_SOURCE"
 export CXXFLAGS="$CXXFLAGS -DCYNARA_STATE_PATH=\\\"%{state_path}\\\" \
                            -DCYNARA_LIB_PATH=\\\"%{lib_path}\\\" \
                            -DCYNARA_TESTS_DIR=\\\"%{tests_dir}\\\" \
-                           -DCYNARA_CONFIGURATION_DIR=\\\"%{conf_path}\\\" \
-                           -DCYNARA_VERSION=\\\"%{version}\\\""
+                           -DCYNARA_CONFIGURATION_DIR=\\\"%{conf_path}\\\""
 export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
 %cmake . \