summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2020-02-28 16:54:07 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2020-03-30 17:05:18 +0200
commit70ccdf894636746755a0ba91e5970be876283d59 (patch)
tree7f7b4d147e95f94c3d97f4ea0555fb0d66a68bb6
parent7b1a05f1f107dda9317fbbf002ff8b30688ba9c5 (diff)
This commit add a sysroot variable in front of the path to header file which the presence is tested. Then we always point to the correct kernel headers path depending on the build environment Bug-AGL: SPEC-3204 Change-Id: Ifb59a897d36c74e6f84897d0bf3db3eb75609702 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--conf.d/cmake/config.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index cedb5e3f..3453d660 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -44,7 +44,7 @@ set(BUILD_TYPE "DEBUG" CACHE STRING "Default Build variant chosen. (Overwritten
# Need module in kernel
# --------------
-execute_process(COMMAND ls /usr/include/linux/can/j1939.h RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
+execute_process(COMMAND ls $ENV{PKG_CONFIG_SYSROOT_DIR}/usr/include/linux/can/j1939.h RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
if(result)
message("Feature J1939 disabled")
@@ -62,7 +62,7 @@ endif()
# Need module in kernel
# --------------
-execute_process(COMMAND ls /usr/include/linux/can/isotp.h RESULT_VARIABLE result2 OUTPUT_QUIET ERROR_QUIET)
+execute_process(COMMAND ls $ENV{PKG_CONFIG_SYSROOT_DIR}/usr/include/linux/can/isotp.h RESULT_VARIABLE result2 OUTPUT_QUIET ERROR_QUIET)
if(result2)
message("Feature ISO TP disabled")