summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2020-11-12 08:43:57 +0100
committerJosé Bollo <jose.bollo@iot.bzh>2020-11-12 08:49:49 +0100
commit7d7907651c42c5c32deabc17b639e0e1765eae60 (patch)
tree98ff9b78dbcddf89e7bbbd6e7c776227034a6a9d
parent825a72f179132978463553ed377f3f3783e72264 (diff)
The version 2.1 fixes a database issue. Bug-AGL: SPEC-3677 Change-Id: I5c8e4595894ee26a2018f939a42ba0b8abcad722 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--CMakeLists.txt6
-rw-r--r--src/main-cynagora-admin.c2
-rw-r--r--src/main-cynagora-agent.c2
-rw-r--r--src/main-cynagorad.c2
4 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a508bb..20afd07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,12 +16,12 @@
# limitations under the License.
###########################################################################
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)
project(cynagora
DESCRIPTION "Secured permission database for applications"
HOMEPAGE_URL "https://gerrit.automotivelinux.org/gerrit/gitweb?p=src/cynagora.git;a=summary"
- VERSION 2.0
+ VERSION 2.1
LANGUAGES C
)
@@ -64,6 +64,8 @@ add_compile_options(-Werror=implicit-function-declaration)
add_compile_options(-ffunction-sections -fdata-sections)
#add_compile_options(-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.)
+add_compile_definitions(VERSION="${PROJECT_VERSION}")
+
###########################################################################
if(WITH_SYSTEMD)
diff --git a/src/main-cynagora-admin.c b/src/main-cynagora-admin.c
index 8f28db5..af3a6ab 100644
--- a/src/main-cynagora-admin.c
+++ b/src/main-cynagora-admin.c
@@ -84,7 +84,7 @@ helptxt[] =
static
const char
versiontxt[] =
- "cynagora-admin version 1.99.99\n"
+ "cynagora-admin version "VERSION"\n"
;
static
diff --git a/src/main-cynagora-agent.c b/src/main-cynagora-agent.c
index 2e7e310..ff11a8f 100644
--- a/src/main-cynagora-agent.c
+++ b/src/main-cynagora-agent.c
@@ -139,7 +139,7 @@ longhelptxt[] =
static
const char
versiontxt[] =
- "cynagora-agent version 1.99.99\n"
+ "cynagora-agent version "VERSION"\n"
;
static char *name;
diff --git a/src/main-cynagorad.c b/src/main-cynagorad.c
index 836e7c8..3b568ab 100644
--- a/src/main-cynagorad.c
+++ b/src/main-cynagorad.c
@@ -132,7 +132,7 @@ helptxt[] =
static
const char
versiontxt[] =
- "cynagorad version 1.99.99\n"
+ "cynagorad version "VERSION"\n"
;
static int isid(const char *text);