diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2020-01-13 12:02:58 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2020-01-13 14:15:10 +0100 |
| commit | 6d4e784aa86127d7bd9d3854c2e88dbd22d33d91 (patch) | |
| tree | 8cbefa8a036442b5adb058c53bd2f6b146635e3e | |
| parent | 21754465dc2bff255c6f6f62a8ec82efc7c5ea8b (diff) | |
variable: Fix trailing - in widget version
Bug-AGL: SPEC-3102
Change-Id: I959230282e22824f0bd3eb335f4511645a33f3bb
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | src/cmake/cmake.d/02-variables.cmake | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/cmake/cmake.d/02-variables.cmake b/src/cmake/cmake.d/02-variables.cmake index ed4aa3e..d79688d 100644 --- a/src/cmake/cmake.d/02-variables.cmake +++ b/src/cmake/cmake.d/02-variables.cmake @@ -102,19 +102,22 @@ endif() # attributes then add the dirty flag if git repo not sync'ed if(CMAKE_VERSION VERSION_GREATER 3.11) if(PROJECT_URL) - project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES} DESCRIPTION ${PROJECT_DESCRIPTION} HOMEPAGE_URL ${PROJECT_URL}) - else() - project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES} DESCRIPTION ${PROJECT_DESCRIPTION}) - endif() + project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES} DESCRIPTION ${PROJECT_DESCRIPTION} HOMEPAGE_URL ${PROJECT_URL}) + else() + project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES} DESCRIPTION ${PROJECT_DESCRIPTION}) + endif() else() - project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES}) + project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES}) endif() if(NOT ${DIRTY_FLAG}) set(PROJECT_VERSION "${PROJECT_VERSION}-${COMMIT_HASH}-dirty") -else() +elseif(${COMMIT_VERSION}) set(PROJECT_VERSION "${PROJECT_VERSION}-${COMMIT_HASH}") +else() + set(PROJECT_VERSION "${PROJECT_VERSION}") endif() + set(AFB_TOKEN "" CACHE PATH "Default AFB_TOKEN") set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN") |