X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=cmake%2Fcmake.d%2F02-variables.cmake;h=693991a6b82ef404b0d4861fd990e84cc1af11a7;hb=f65761cff834757e97165fb2de5cffa332c9a1e5;hp=b4940f2d293283ec4926d185c0898aced4481372;hpb=4b265031de2f405e44fe595e99c29ffe2cfd72b9;p=apps%2Fapp-templates.git

diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake
index b4940f2..693991a 100644
--- a/cmake/cmake.d/02-variables.cmake
+++ b/cmake/cmake.d/02-variables.cmake
@@ -67,6 +67,13 @@ execute_process(COMMAND git describe --abbrev=0
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+# Get the git commit hash to append to the version
+execute_process(COMMAND git rev-parse --short HEAD
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	OUTPUT_VARIABLE COMMIT_HASH
+	OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
 # Detect unstaged or untracked changes
 execute_process(COMMAND git status --short
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -84,7 +91,9 @@ endif()
 # attributes then add the dirty flag if git repo not sync'ed
 project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES})
 if(NOT ${DIRTY_FLAG})
-set(PROJECT_VERSION "${PROJECT_VERSION}-dirty")
+	set(PROJECT_VERSION "${PROJECT_VERSION}-${COMMIT_HASH}-dirty")
+else()
+	set(PROJECT_VERSION "${PROJECT_VERSION}-${COMMIT_HASH}")
 endif()
 
 set(AFB_TOKEN   ""      CACHE PATH "Default AFB_TOKEN")
@@ -94,7 +103,7 @@ set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN")
 if (gcc_minimal_version)
 message (STATUS "${Cyan}-- Check gcc_minimal_version (found gcc version ${CMAKE_C_COMPILER_VERSION}) \
 (found g++ version ${CMAKE_CXX_COMPILER_VERSION})${ColourReset}")
-if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${gcc_minimal_version} OR CMAKE_C_COMPILER_VERSION VERSION_LESS ${gcc_minimal_version})
+if (("${PROJECT_LANGUAGES}" MATCHES "CXX" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${gcc_minimal_version}) OR CMAKE_C_COMPILER_VERSION VERSION_LESS ${gcc_minimal_version})
 message(FATAL_ERROR "${Red}**** FATAL: Require at least gcc-${gcc_minimal_version} please set CMAKE_C[XX]_COMPILER")
 endif()
 endif(gcc_minimal_version)