From 9bcc943e620004b3bafe043b452eb5ba4c7954c9 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 23 Jan 2019 10:19:26 +0100 Subject: Set PROJECT_VERSION overwritable by cli Use AGLVERSION variable that could be set by command-line to override the one set in the CMakeLists.txt file. Change-Id: Ic8137766ee3a0fb5b51cc49d2ea39d8d66e48b3f Signed-off-by: Romain Forlot --- CMakeLists.txt | 2 ++ afb-helpers-qt.pc.in | 1 - afb-helpers.pc.in | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c54809b..682b42d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3) include(GNUInstallDirs) set(TARGET_NAME "afb-helpers") +set(AGLVERSION 6.99 CACHE STRING "Current AGL Version") +set(PROJECT_VERSION ${AGLVERSION} CACHE STRING "Project version can override AGLVERSION") set(PROJECT_PRETTY_NAME "Afb Helpers") set(PROJECT_DESCRIPTION "Library providing some helpful functions for apps using Application Framework Binder") set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/libafb-helpers") diff --git a/afb-helpers-qt.pc.in b/afb-helpers-qt.pc.in index 9bda785..450293e 100644 --- a/afb-helpers-qt.pc.in +++ b/afb-helpers-qt.pc.in @@ -25,6 +25,5 @@ Name: @TARGET_NAME@-qt Description: @PROJECT_DESCRIPTION@ and Qt Version: @PROJECT_VERSION@ URL: @PROJECT_URL@ -Libs.private: Libs: -L@CMAKE_INSTALL_LIBDIR@ -l@TARGET_NAME@-qt Cflags: -I${includedir} diff --git a/afb-helpers.pc.in b/afb-helpers.pc.in index 3ddbbb8..fe96b86 100644 --- a/afb-helpers.pc.in +++ b/afb-helpers.pc.in @@ -25,7 +25,6 @@ Name: @TARGET_NAME@ Description: @PROJECT_DESCRIPTION@ Version: @PROJECT_VERSION@ URL: @PROJECT_URL@ -Libs.private: Libs: -L@CMAKE_INSTALL_LIBDIR@ -l@TARGET_NAME@ Cflags: -I${includedir} -- cgit