From 7dabdeb9c967993167b93860cac4b79a94f27401 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 23 Nov 2017 19:09:13 +0100 Subject: No failure if none tags found on project git repo Change-Id: Idb46117feb860c84a14b6c256ee809e31546fd7c Signed-off-by: Romain Forlot --- cmake/cmake.d/03-macros.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake index 71907af..aef5498 100644 --- a/cmake/cmake.d/03-macros.cmake +++ b/cmake/cmake.d/03-macros.cmake @@ -536,10 +536,14 @@ macro(project_closing_msg) endmacro() macro(check_version) - if(${GIT_PROJECT_VERSION} VERSION_GREATER ${APP_TEMPLATES_VERSION}) - message(STATUS "${Yellow}.. Your app-templates submodule version seems outdated. You should update it with 'git submodule update --remote ${PROJECT_APP_TEMPLATES_DIR}'. - - App-templates version: ${APP_TEMPLATES_VERSION} - - Project version according AGL Git tag: ${GIT_PROJECT_VERSION}" - ) + if(${GIT_PROJECT_VERSION}) + if(${GIT_PROJECT_VERSION} VERSION_GREATER ${APP_TEMPLATES_VERSION}) + message(STATUS "${Yellow}.. Your app-templates submodule version seems outdated. You should update it with 'git submodule update --remote ${PROJECT_APP_TEMPLATES_DIR}'. + - App-templates version: ${APP_TEMPLATES_VERSION} + - Project version according AGL Git tag: ${GIT_PROJECT_VERSION}" + ) + endif() + else() + message(STATUS "${Yellow} Your git project repo doesn't have any version tags nor hosted by AGL gerrit infrastructure. Can't compare version between project and app-templates ${APP_TEMPLATES_VERSION} ${ColourReset}") endif() endmacro() -- cgit 1.2.3-korg