diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-08-29 17:50:05 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-08-29 17:50:17 +0200 |
| commit | b5fb4364e02d4d3db339e966c69cbe1177f4f525 (patch) | |
| tree | 9cddb6c067339e6d32e8c01f78b90304dee6334e | |
| parent | 42e5f14ffa00542385d0d60ee8b00494f590ab8c (diff) | |
Fix: wrong OS detection when SDK env or Yocto
Change-Id: Iece230f0708129ea5980c61dae2d2cb66d32e7eb
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | cmake/cmake.d/02-variables.cmake | 11 | ||||
| -rw-r--r-- | cmake/common.cmake | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake index e69f342..0532c33 100644 --- a/cmake/cmake.d/02-variables.cmake +++ b/cmake/cmake.d/02-variables.cmake @@ -48,17 +48,6 @@ endif() # Native packaging name set(NPKG_PROJECT_NAME agl-${PROJECT_NAME}) -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}) math(EXPR a "${LINUX_VERSION_CODE} >> 16") math(EXPR b "(${LINUX_VERSION_CODE} >> 8) & 255") diff --git a/cmake/common.cmake b/cmake/common.cmake index ad5567a..041bb74 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -24,6 +24,17 @@ # Customise your preferences in "./conf.d/cmake/config.cmake" #-------------------------------------------------------------------------- +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() + # Get the os type # Used to package .deb set(OS_RELEASE_PATH "${BUILD_ENV_SYSROOT}/etc/os-release") |