1 From 9fd3aef2f9bb7a2b05b6823281bb5c988fa25149 Mon Sep 17 00:00:00 2001
2 From: Romain Naour <romain.naour@openwide.fr>
3 Date: Mon, 17 Nov 2014 23:27:05 +0100
4 Subject: [PATCH 1/2] [FIX] use a better regex for CMAKE_SYSTEM_PROCESSOR
6 According to CMake doc, CMAKE_SYSTEM_PROCESSOR is set to the
7 output of the command "uname -p" (in fact it is the output of "uname
8 -m"). This is only true for native compilation.
10 In the case of cross-compilation, the CMake code does not set anything,
11 it just expects the CMAKE_SYSTEM_* variables to be set in the
14 Add a test matching the patern "^i.86$" and keep the old one "x86" for
16 By doing that, factorize this test using "^(i.86|x86(_64)?)$".
18 Thanks to Samuel Martin [1]
19 [1] http://lists.busybox.net/pipermail/buildroot/2014-November/112163.html
21 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
23 Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt | 15 ++++-----------
24 .../X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt | 15 ++++-----------
25 2 files changed, 8 insertions(+), 22 deletions(-)
27 diff --git a/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt b/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt
28 index 271ecdc..b49ef53 100644
29 --- a/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt
30 +++ b/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt
31 @@ -154,21 +154,14 @@ SET(MODULE_SOURCE_FILES
32 ${POWERLINK_SOURCE_DIR}/ObjDicts/${OBJDICT}/Objdict.c
35 -IF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
36 +IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
37 SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)
39 -ELSEIF ( CMAKE_SYSTEM_PROCESSOR STREQUAL arm
40 - OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
41 +ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
42 SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amiarm.c)
44 -ELSEIF ( CMAKE_SYSTEM_PROCESSOR STREQUAL i686
45 - OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
46 - SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)
48 -ELSE (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
49 +ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
51 "ami: CMAKE_SYSTEM_PROCESSOR is set to ${CMAKE_SYSTEM_PROCESSOR}. Valid targets are (x86, x86_64, arm, armv7l, i686).")
52 -ENDIF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
53 +ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
57 diff --git a/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt b/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt
58 index 1b47c76..f534a4d 100644
59 --- a/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt
60 +++ b/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt
61 @@ -171,21 +171,14 @@ ELSE(CFG_POWERLINK_EDRV STREQUAL "I210")
62 SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/Target/X86/Linux/gnu/generic/TimerHighReskX86.c)
63 ENDIF(CFG_POWERLINK_EDRV STREQUAL "I210")
65 -IF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
66 +IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
67 SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)
69 -ELSEIF ( CMAKE_SYSTEM_PROCESSOR STREQUAL arm
70 - OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
71 +ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
72 SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amiarm.c)
74 -ELSEIF ( CMAKE_SYSTEM_PROCESSOR STREQUAL i686
75 - OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
76 - SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)
78 -ELSE (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
79 +ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
81 "ami: CMAKE_SYSTEM_PROCESSOR is set to ${CMAKE_SYSTEM_PROCESSOR}. Valid targets are (x86, x86_64, arm, armv7l, i686).")
82 -ENDIF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)
83 +ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")