X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F02-variables.cmake;h=4a4e5037018a8e465c2c0385319fa1e93262ef40;hb=28dcbc3a2c7fef8988d71862653f95cf455c97c9;hp=dd86d2b78886e10781dfe4a682b58518ed90c7ef;hpb=3a90fb6f2c4518ebab484cde90919c19456dc04c;p=apps%2Fapp-templates.git

diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake
index dd86d2b..4a4e503 100644
--- a/cmake/cmake.d/02-variables.cmake
+++ b/cmake/cmake.d/02-variables.cmake
@@ -26,50 +26,37 @@
 
 # Get colorized message output non Windows OS. You know bash ? :)
 if(NOT WIN32)
-  string(ASCII 27 Esc)
-  set(ColourReset "${Esc}[m")
-  set(ColourBold  "${Esc}[1m")
-  set(Red         "${Esc}[31m")
-  set(Green       "${Esc}[32m")
-  set(Yellow      "${Esc}[33m")
-  set(Blue        "${Esc}[34m")
-  set(Magenta     "${Esc}[35m")
-  set(Cyan        "${Esc}[36m")
-  set(White       "${Esc}[37m")
-  set(BoldRed     "${Esc}[1;31m")
-  set(BoldGreen   "${Esc}[1;32m")
-  set(BoldYellow  "${Esc}[1;33m")
-  set(BoldBlue    "${Esc}[1;34m")
-  set(BoldMagenta "${Esc}[1;35m")
-  set(BoldCyan    "${Esc}[1;36m")
-  set(BoldWhite   "${Esc}[1;37m")
+	string(ASCII 27 Esc)
+	set(ColourReset "${Esc}[m")
+	set(ColourBold  "${Esc}[1m")
+	set(Red         "${Esc}[31m")
+	set(Green       "${Esc}[32m")
+	set(Yellow      "${Esc}[33m")
+	set(Blue        "${Esc}[34m")
+	set(Magenta     "${Esc}[35m")
+	set(Cyan        "${Esc}[36m")
+	set(White       "${Esc}[37m")
+	set(BoldRed     "${Esc}[1;31m")
+	set(BoldGreen   "${Esc}[1;32m")
+	set(BoldYellow  "${Esc}[1;33m")
+	set(BoldBlue    "${Esc}[1;34m")
+	set(BoldMagenta "${Esc}[1;35m")
+	set(BoldCyan    "${Esc}[1;36m")
+	set(BoldWhite   "${Esc}[1;37m")
 endif()
 
 # Native packaging name
 set(NPKG_PROJECT_NAME agl-${PROJECT_NAME})
 
-# Get the os type
-# Used to package .deb
-if(EXISTS "/etc/os-release")
-	execute_process(COMMAND grep -E "^ID(=|_LIKE=)" /etc/os-release
-		OUTPUT_VARIABLE TMP_OSRELEASE
-	)
-	if (NOT TMP_OSRELEASE STREQUAL "")
-		string(REGEX REPLACE ".*=" "" OSRELEASE ${TMP_OSRELEASE})
-	else()
-		set(OSRELEASE "NOT DEBIAN OS")
-	endif()
-	message(STATUS "OSRELEASE = ${OSRELEASE}")
-else()
-	set(OSRELEASE "NOT DEBIAN OS")
-endif()
-
 if(DEFINED ENV{SDKTARGETSYSROOT})
 	file(STRINGS $ENV{SDKTARGETSYSROOT}/usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+	set(BUILD_ENV_SYSROOT $ENV{SDKTARGETSYSROOT})
 elseif(DEFINED ENV{PKG_CONFIG_SYSROOT_DIR})
 	file(STRINGS $ENV{PKG_CONFIG_SYSROOT_DIR}/usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+	set(BUILD_ENV_SYSROOT $ENV{PKG_CONFIG_SYSROOT_DIR})
 else()
 	file(STRINGS /usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+	set(BUILD_ENV_SYSROOT "")
 endif()
 
 string(REGEX MATCH "[0-9]+" LINUX_VERSION_CODE ${LINUX_VERSION_CODE_LINE})
@@ -79,6 +66,25 @@ math(EXPR c "(${LINUX_VERSION_CODE} & 255)")
 
 set(KERNEL_VERSION "${a}.${b}.${c}")
 
+# Get the os type
+# Used to package .deb
+set(OS_RELEASE_PATH "${BUILD_ENV_SYSROOT}/etc/os-release")
+if(EXISTS ${OS_RELEASE_PATH})
+	execute_process(COMMAND bash "-c" "grep -E '^ID(_LIKE)?=' ${OS_RELEASE_PATH} | tail -n 1"
+		OUTPUT_VARIABLE TMP_OSRELEASE
+	)
+
+	if (NOT TMP_OSRELEASE STREQUAL "")
+		string(REGEX REPLACE ".*=\"?([0-9a-z\._-]*)\"?\n" "\\1" OSRELEASE ${TMP_OSRELEASE})
+	else()
+		set(OSRELEASE "NOT COMPATIBLE !")
+	endif()
+
+else()
+	set(OSRELEASE "NOT COMPATIBLE ! Missing ${OS_RELEASE_PATH} file.")
+endif()
+message(STATUS "Distribution used ${OSRELEASE}")
+
 # Include project configuration
 # ------------------------------
 project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES})
@@ -163,6 +169,6 @@ set(GDB_INITIAL_BREAK "personality" CACHE STRING "Initial Break Point for GDB re
 # Define some checker binaries to verify input DATA files
 # to be included in package. Schema aren't checked for now.
 # Dummy checker about JSON.
-set(LUA_CHECKER "luac -o /dev/null" CACHE STRING "LUA compiler")
+set(LUA_CHECKER "luac" "-p" CACHE STRING "LUA compiler")
 set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
 set(JSON_CHECKER "echo" CACHE STRING "JSON linter")