Skip to content

Commit e232644

Browse files
StephanKaarnemertz
authored andcommitted
fixed review findings
1 parent 4113d16 commit e232644

3 files changed

Lines changed: 2 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ RUN_CONAN()
103103
ADD_SUBDIRECTORY(src)
104104

105105
IF(CMAKE_CROSSCOMPILING)
106+
MESSAGE("Test are not built for GCC ARM toolchain!")
106107
RETURN()
107108
ENDIF()
108109

CMakePresets.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@
330330
"CMAKE_BUILD_TYPE": "Debug",
331331
"CMAKE_SYSTEM_NAME": "Linux",
332332
"CONAN_ARCHITECTURE": "armv7",
333-
"CMAKE_CROSSCOMPILE": "ON",
334333
"CMAKE_SYSTEM_PROCESSOR": "arm",
335334
"CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",
336335
"CMAKE_CROSSCOMPILING": "TRUE"
@@ -347,7 +346,6 @@
347346
"CMAKE_BUILD_TYPE": "Release",
348347
"CMAKE_SYSTEM_NAME": "Linux",
349348
"CONAN_ARCHITECTURE": "armv7",
350-
"CMAKE_CROSSCOMPILE": "ON",
351349
"CMAKE_SYSTEM_PROCESSOR": "arm",
352350
"CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",
353351
"CMAKE_CROSSCOMPILING": "TRUE"

cmake/Options.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ OPTION(CPP_STARTER_USE_SML "Enable compilation of SML sample" OFF)
3232
OPTION(CPP_STARTER_USE_BOOST_BEAST "Enable compilation of boost beast sample" OFF)
3333
OPTION(CPP_STARTER_USE_CROW "Enable compilation of crow sample" OFF)
3434
OPTION(CPP_STARTER_USE_CPPZMQ_PROTO "Enable compilation of protobuf and cppzmq sample" OFF)
35-
OPTION(CPP_STARTER_USE_EMBEDDED_TOOLCHAIN "Enable compilation an example cortex m4 project" OFF)
35+
OPTION(CPP_STARTER_USE_EMBEDDED_TOOLCHAIN "Enable compilation of an example cortex m4 project" OFF)
3636

3737
# Note: by default ENABLE_DEVELOPER_MODE is True
3838
# This means that all analysis (sanitizers, static analysis)

0 commit comments

Comments
 (0)