aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-11-23 19:09:13 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-11-23 19:12:12 +0100
commit7dabdeb9c967993167b93860cac4b79a94f27401 (patch)
treed33b290c6fcc1d9cc23288171df9485b53c603fa
parent52a3998bca406e2c9813546c0bc5dde8d4fa1795 (diff)
No failure if none tags found on project git repo
Change-Id: Idb46117feb860c84a14b6c256ee809e31546fd7c Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--cmake/cmake.d/03-macros.cmake14
1 files 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()