Skip to content

Commit 325ce46

Browse files
shritshrit
committed
Fix STREQUAL and the board name
Signed-off-by: Omar Shrit <omar@avontech.fr>
1 parent be2096d commit 325ce46

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎embedded/crosscompile_random_forest/CMake/crosscompile-arch-config.cmake‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,63 +34,63 @@ endif()
3434
string(TOUPPER ${ARCH_NAME} ARCH)
3535

3636
# Set specific platforms CMAKE CXX flags.
37-
if(ARCH MATCHES "RPI0" OR ARCH MATCHES "RPI1" OR ARCH MATCHES "ARM11")
37+
if(ARCH STREQUAL "RPI0" OR ARCH STREQUAL "RPI1" OR ARCH STREQUAL "ARM11")
3838
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=arm1176jzf-s")
3939
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp")
4040
set(OPENBLAS_TARGET "ARMV6")
4141
set(OPENBLAS_BINARY "32")
42-
elseif(ARCH MATCHES "RPI2" OR ARCH MATCHES "CORTEXA7")
42+
elseif(ARCH STREQUAL "RPI2" OR ARCH STREQUAL "CORTEXA7")
4343
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a7")
4444
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon-vfpv4")
4545
set(OPENBLAS_TARGET "ARMV7")
4646
set(OPENBLAS_BINARY "32")
47-
elseif(ARCH MATCHES "CORTEXA8")
47+
elseif(ARCH STREQUAL "CORTEXA8")
4848
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a8")
4949
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon")
5050
set(OPENBLAS_TARGET "ARMV7")
5151
set(OPENBLAS_BINARY "32")
52-
elseif(ARCH MATCHES "CORTEXA9")
52+
elseif(ARCH STREQUAL "CORTEXA9")
5353
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a9")
5454
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon")
5555
set(OPENBLAS_TARGET "CORTEXA9")
5656
set(OPENBLAS_BINARY "32")
57-
elseif(ARCH MATCHES "CORTEXA15")
57+
elseif(ARCH STREQUAL "CORTEXA15")
5858
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a15")
5959
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon")
6060
set(OPENBLAS_TARGET "CORTEXA15")
6161
set(OPENBLAS_BINARY "32")
62-
elseif(ARCH MATCHES "RPI3" OR ARCH MATCHES "CORTEXA53")
62+
elseif(ARCH STREQUAL "RPI3" OR ARCH STREQUAL "CORTEXA53")
6363
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a53 -ftree-vectorize")
6464
set(OPENBLAS_TARGET "CORTEXA53")
6565
set(OPENBLAS_BINARY "64")
66-
elseif(ARCH MATCHES "RPI4" OR ARCH MATCHES "CORTEXA72")
66+
elseif(ARCH STREQUAL "RPI4" OR ARCH STREQUAL "CORTEXA72")
6767
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8.2-a+crypto+fp16+rcpc+dotprod -fasynchronous-unwind-tables")
6868
set(OPENBLAS_TARGET "CORTEXA72")
6969
set(OPENBLAS_BINARY "64")
70-
elseif(ARCH MATCHES "JETSONAGX" OR ARCH MATCHES "CORTEXA76")
70+
elseif(ARCH STREQUAL "JETSONAGX" OR ARCH STREQUAL "CORTEXA76")
7171
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a76 -ftree-vectorize")
7272
set(OPENBLAS_TARGET "CORTEXA76")
7373
set(OPENBLAS_BINARY "64")
74-
elseif(ARCH MATCHES "BV")
74+
elseif(ARCH STREQUAL "BV")
7575
set(OPENBLAS_TARGET "RISCV64_GENERIC")
7676
set(OPENBLAS_BINARY "64")
77-
elseif(ARCH MATCHES "C906")
77+
elseif(ARCH STREQUAL "C906")
7878
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=thead-c906")
7979
set(OPENBLAS_TARGET "RISCV64_GENERIC")
8080
set(OPENBLAS_BINARY "64")
81-
elseif(ARCH MATCHES "x280")
81+
elseif(ARCH STREQUAL "x280")
8282
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=sifive-x280")
8383
set(OPENBLAS_TARGET "x280")
8484
set(OPENBLAS_BINARY "64")
85-
elseif(ARCH MATCHES "KATAMI")
85+
elseif(ARCH STREQUAL "KATAMI")
8686
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium3")
8787
set(OPENBLAS_TARGET "KATAMI")
8888
set(OPENBLAS_BINARY "32")
89-
elseif(ARCH MATCHES "COPPERMINE")
89+
elseif(ARCH STREQUAL "COPPERMINE")
9090
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium3")
9191
set(OPENBLAS_TARGET "COPPERMINE")
9292
set(OPENBLAS_BINARY "32")
93-
elseif(ARCH MATCHES "NORTHWOOD")
93+
elseif(ARCH STREQUAL "NORTHWOOD")
9494
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium4")
9595
set(OPENBLAS_TARGET "NORTHWOOD")
9696
set(OPENBLAS_BINARY "32")

‎embedded/embedded_cmake_template/CMake/crosscompile-arch-config.cmake‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,63 +34,63 @@ endif()
3434
string(TOUPPER ${ARCH_NAME} ARCH)
3535

3636
# Set specific platforms CMAKE CXX flags.
37-
if(ARCH MATCHES "RPI0" OR ARCH MATCHES "RPI1" OR ARCH MATCHES "ARM11")
37+
if(ARCH STREQUAL "RPI0" OR ARCH STREQUAL "RPI1" OR ARCH STREQUAL "ARM11")
3838
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=arm1176jzf-s")
3939
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp")
4040
set(OPENBLAS_TARGET "ARMV6")
4141
set(OPENBLAS_BINARY "32")
42-
elseif(ARCH MATCHES "RPI2" OR ARCH MATCHES "CORTEXA7")
42+
elseif(ARCH STREQUAL "RPI2" OR ARCH STREQUAL "CORTEXA7")
4343
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a7")
4444
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon-vfpv4")
4545
set(OPENBLAS_TARGET "ARMV7")
4646
set(OPENBLAS_BINARY "32")
47-
elseif(ARCH MATCHES "CORTEXA8")
47+
elseif(ARCH STREQUAL "CORTEXA8")
4848
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a8")
4949
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon")
5050
set(OPENBLAS_TARGET "ARMV7")
5151
set(OPENBLAS_BINARY "32")
52-
elseif(ARCH MATCHES "CORTEXA9")
52+
elseif(ARCH STREQUAL "CORTEXA9")
5353
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a9")
5454
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon")
5555
set(OPENBLAS_TARGET "CORTEXA9")
5656
set(OPENBLAS_BINARY "32")
57-
elseif(ARCH MATCHES "CORTEXA15")
57+
elseif(ARCH STREQUAL "CORTEXA15")
5858
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a15")
5959
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon")
6060
set(OPENBLAS_TARGET "CORTEXA15")
6161
set(OPENBLAS_BINARY "32")
62-
elseif(ARCH MATCHES "RPI3" OR ARCH MATCHES "CORTEXA53")
62+
elseif(ARCH STREQUAL "RPI3" OR ARCH STREQUAL "CORTEXA53")
6363
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a53 -ftree-vectorize")
6464
set(OPENBLAS_TARGET "CORTEXA53")
6565
set(OPENBLAS_BINARY "64")
66-
elseif(ARCH MATCHES "RPI4" OR ARCH MATCHES "CORTEXA72")
66+
elseif(ARCH STREQUAL "RPI4" OR ARCH STREQUAL "CORTEXA72")
6767
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8.2-a+crypto+fp16+rcpc+dotprod -fasynchronous-unwind-tables")
6868
set(OPENBLAS_TARGET "CORTEXA72")
6969
set(OPENBLAS_BINARY "64")
70-
elseif(ARCH MATCHES "JETSONAGX" OR ARCH MATCHES "CORTEXA76")
70+
elseif(ARCH STREQUAL "JETSONAGX" OR ARCH STREQUAL "CORTEXA76")
7171
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=cortex-a76 -ftree-vectorize")
7272
set(OPENBLAS_TARGET "CORTEXA76")
7373
set(OPENBLAS_BINARY "64")
74-
elseif(ARCH MATCHES "BV")
74+
elseif(ARCH STREQUAL "BV")
7575
set(OPENBLAS_TARGET "RISCV64_GENERIC")
7676
set(OPENBLAS_BINARY "64")
77-
elseif(ARCH MATCHES "C906")
77+
elseif(ARCH STREQUAL "C906")
7878
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=thead-c906")
7979
set(OPENBLAS_TARGET "RISCV64_GENERIC")
8080
set(OPENBLAS_BINARY "64")
81-
elseif(ARCH MATCHES "x280")
81+
elseif(ARCH STREQUAL "x280")
8282
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=sifive-x280")
8383
set(OPENBLAS_TARGET "x280")
8484
set(OPENBLAS_BINARY "64")
85-
elseif(ARCH MATCHES "KATAMI")
85+
elseif(ARCH STREQUAL "KATAMI")
8686
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium3")
8787
set(OPENBLAS_TARGET "KATAMI")
8888
set(OPENBLAS_BINARY "32")
89-
elseif(ARCH MATCHES "COPPERMINE")
89+
elseif(ARCH STREQUAL "COPPERMINE")
9090
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium3")
9191
set(OPENBLAS_TARGET "COPPERMINE")
9292
set(OPENBLAS_BINARY "32")
93-
elseif(ARCH MATCHES "NORTHWOOD")
93+
elseif(ARCH STREQUAL "NORTHWOOD")
9494
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium4")
9595
set(OPENBLAS_TARGET "NORTHWOOD")
9696
set(OPENBLAS_BINARY "32")

0 commit comments

Comments
 (0)