Skip to content

Commit 422277b

Browse files
casarolicasaroli
committed
build(board_specific): fix build
Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>
1 parent b3d0803 commit 422277b

6 files changed

Lines changed: 56 additions & 132 deletions

File tree

‎board_specific/arduino_portenta_h7/blinky-h7/CMakeLists.txt‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
1-
cmake_minimum_required(VERSION 3.20.0)
1+
cmake_minimum_required (VERSION 3.20.0)
22

3-
# Set the WASI SDK toolchain file
4-
include(${CMAKE_CURRENT_LIST_DIR}/../../ocre.cmake)
3+
include(${CMAKE_CURRENT_LIST_DIR}/../../../ocre.cmake)
54

6-
# Set the project name (needs to come after the toolchain file)
7-
set(APPNAME blinky-h7)
8-
project(${APPNAME})
5+
project(blinky-h7)
96

10-
# Set the linker flags
11-
set(CMAKE_EXE_LINKER_FLAGS "-Wl,--strip-all -Wl,--allow-undefined")
7+
add_executable(blinky-h7.wasm main.c)
128

13-
# Set compilation flags
14-
add_compile_options(
15-
-O0 -Wno-unknown-attributes
16-
-O3
17-
-Wall
18-
-Wextra
19-
-Wno-unused-parameter
20-
)
9+
add_subdirectory(../../../ocre-sdk ocre-sdk)
2110

22-
# Create the executable target
23-
add_executable(${APPNAME}.wasm main.c)
11+
target_link_libraries(blinky-h7.wasm
12+
PUBLIC
13+
ocre_api
14+
)

‎board_specific/b_u585i_iot02a/blinky-u585/CMakeLists.txt‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
cmake_minimum_required(VERSION 3.20.0)
2-
include(${CMAKE_CURRENT_LIST_DIR}/../../ocre.cmake)
3-
set(APPNAME blinky-u585)
4-
project(${APPNAME} LANGUAGES C)
1+
cmake_minimum_required (VERSION 3.20.0)
52

6-
set(CMAKE_EXE_LINKER_FLAGS "-Wl,--strip-all -Wl,--allow-undefined")
7-
add_compile_options(
8-
-O3
9-
-Wall
10-
-Wextra
11-
-Wno-unused-parameter
12-
-Wno-unknown-attributes
13-
)
3+
include(${CMAKE_CURRENT_LIST_DIR}/../../../ocre.cmake)
4+
5+
project(blinky-u585)
146

15-
# Add the ocre-sdk as a subdirectory and build it
16-
set(OCRE_SDK_PATH "../../../ocre-sdk")
17-
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${OCRE_SDK_PATH}/CMakeLists.txt")
18-
message(FATAL_ERROR "ocre-sdk not found at ${OCRE_SDK_PATH}. Please ensure the ocre-sdk directory exists and contains CMakeLists.txt")
19-
endif()
7+
add_executable(blinky-u585.wasm main.c)
208

21-
add_subdirectory(${OCRE_SDK_PATH} ocre-sdk-build)
9+
add_subdirectory(../../../ocre-sdk ocre-sdk)
2210

23-
add_executable(${APPNAME}.wasm main.c)
24-
target_include_directories(${APPNAME}.wasm PRIVATE ocre_api)
25-
target_link_libraries(${APPNAME}.wasm PRIVATE ocre_api)
11+
target_link_libraries(blinky-u585.wasm
12+
PUBLIC
13+
ocre_api
14+
)

‎board_specific/b_u585i_iot02a/blinky-xmas/CMakeLists.txt‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
cmake_minimum_required(VERSION 3.20.0)
2-
include(${CMAKE_CURRENT_LIST_DIR}/../../ocre.cmake)
3-
set(APPNAME blinky-xmas)
4-
project(${APPNAME} LANGUAGES C)
1+
cmake_minimum_required (VERSION 3.20.0)
52

6-
set(CMAKE_EXE_LINKER_FLAGS "-Wl,--strip-all -Wl,--allow-undefined")
7-
add_compile_options(
8-
-O3
9-
-Wall
10-
-Wextra
11-
-Wno-unused-parameter
12-
-Wno-unknown-attributes
13-
)
3+
include(${CMAKE_CURRENT_LIST_DIR}/../../../ocre.cmake)
4+
5+
project(blinky-xmas)
146

15-
# Add the ocre-sdk as a subdirectory and build it
16-
set(OCRE_SDK_PATH "../../../ocre-sdk")
17-
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${OCRE_SDK_PATH}/CMakeLists.txt")
18-
message(FATAL_ERROR "ocre-sdk not found at ${OCRE_SDK_PATH}. Please ensure the ocre-sdk directory exists and contains CMakeLists.txt")
19-
endif()
7+
add_executable(blinky-xmas.wasm main.c)
208

21-
add_subdirectory(${OCRE_SDK_PATH} ocre-sdk-build)
9+
add_subdirectory(../../../ocre-sdk ocre-sdk)
2210

23-
add_executable(${APPNAME}.wasm main.c)
24-
target_include_directories(${APPNAME}.wasm PRIVATE ocre_api)
25-
target_link_libraries(${APPNAME}.wasm PRIVATE ocre_api)
11+
target_link_libraries(blinky-xmas.wasm
12+
PUBLIC
13+
ocre_api
14+
)

‎board_specific/b_u585i_iot02a/modbus-server/CMakeLists.txt‎

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,15 @@
11
cmake_minimum_required (VERSION 3.20.0)
22

3-
# Set the WASI SDK toolchain file
4-
include(${CMAKE_CURRENT_LIST_DIR}/../../ocre.cmake)
3+
include(${CMAKE_CURRENT_LIST_DIR}/../../../ocre.cmake)
54

6-
set(CMAKE_BUILD_TYPE Release)
5+
project(modbus-server)
76

8-
set(APPNAME modbus-server)
9-
project(${APPNAME})
7+
add_executable(modbus-server.wasm main.c mongoose.c)
108

11-
# Include the WAMR socket library CMake file (adjust path as needed)
12-
include(../../../wasm-micro-runtime/core/iwasm/libraries/lib-socket/lib_socket_wasi.cmake)
9+
add_subdirectory(../../../ocre-sdk ocre-sdk)
1310

14-
add_compile_options(
15-
# --target=wasm32-wasm-unknown # Target WebAssembly
16-
-Os -Wno-unknown-attributes
17-
)
18-
19-
# Set compilation flags
20-
add_link_options(
21-
-Wl,--strip-all # Strip all symbol/debug information from the binary
22-
-Wl,--allow-undefined # Let the ocre api functions be undefined
23-
-z stack-size=16384
24-
-Wl,--initial-memory=65536 # Minimum size of linear memory\
25-
-Wl,--max-memory=65536 # Maximum size of linear memory
26-
)
27-
28-
# Add the ocre-sdk as a subdirectory and build it
29-
add_subdirectory(../../../ocre-sdk ocre-sdk-build)
30-
31-
add_executable(${APPNAME}.wasm main.c mongoose.c)
32-
33-
# Include + link the Ocre API and WAMR socket library
34-
target_include_directories(${APPNAME}.wasm PRIVATE
35-
../../../wasm-micro-runtime/core/iwasm/libraries/lib-socket
11+
target_link_libraries(modbus-server.wasm
12+
PUBLIC
3613
ocre_api
14+
socket_wasi_ext
3715
)
38-
target_link_libraries(${APPNAME}.wasm socket_wasi_ext ocre_api)

‎board_specific/b_u585i_iot02a/sensor-IMU/CMakeLists.txt‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
cmake_minimum_required(VERSION 3.20.0)
2-
include(${CMAKE_CURRENT_LIST_DIR}/../../ocre.cmake)
3-
set(APPNAME sensor-imu)
4-
project(${APPNAME} LANGUAGES C)
1+
cmake_minimum_required (VERSION 3.20.0)
52

6-
set(CMAKE_EXE_LINKER_FLAGS "-Wl,--strip-all -Wl,--allow-undefined")
7-
add_compile_options(
8-
-O3
9-
-Wall
10-
-Wextra
11-
-Wno-unused-parameter
12-
-Wno-unknown-attributes
13-
)
3+
include(${CMAKE_CURRENT_LIST_DIR}/../../../ocre.cmake)
4+
5+
project(sensor-imu)
146

15-
# Add the ocre-sdk as a subdirectory and build it
16-
set(OCRE_SDK_PATH "../../../ocre-sdk")
17-
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${OCRE_SDK_PATH}/CMakeLists.txt")
18-
message(FATAL_ERROR "ocre-sdk not found at ${OCRE_SDK_PATH}. Please ensure the ocre-sdk directory exists and contains CMakeLists.txt")
19-
endif()
7+
add_executable(sensor-imu.wasm main.c)
208

21-
add_subdirectory(${OCRE_SDK_PATH} ocre-sdk-build)
9+
add_subdirectory(../../../ocre-sdk ocre-sdk)
2210

23-
add_executable(${APPNAME}.wasm main.c)
24-
target_include_directories(${APPNAME}.wasm PRIVATE ocre_api)
25-
target_link_libraries(${APPNAME}.wasm PRIVATE ocre_api)
11+
target_link_libraries(sensor-imu.wasm
12+
PUBLIC
13+
ocre_api
14+
)

‎board_specific/b_u585i_iot02a/sensor/CMakeLists.txt‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
cmake_minimum_required(VERSION 3.20.0)
2-
include(${CMAKE_CURRENT_LIST_DIR}/../../ocre.cmake)
3-
set(APPNAME sensor)
4-
project(${APPNAME} LANGUAGES C)
1+
cmake_minimum_required (VERSION 3.20.0)
52

6-
set(CMAKE_EXE_LINKER_FLAGS "-Wl,--strip-all -Wl,--allow-undefined")
7-
add_compile_options(
8-
-O3
9-
-Wall
10-
-Wextra
11-
-Wno-unused-parameter
12-
-Wno-unknown-attributes
13-
)
3+
include(${CMAKE_CURRENT_LIST_DIR}/../../../ocre.cmake)
4+
5+
project(sensor)
146

15-
# Add the ocre-sdk as a subdirectory and build it
16-
set(OCRE_SDK_PATH "../../../ocre-sdk")
17-
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${OCRE_SDK_PATH}/CMakeLists.txt")
18-
message(FATAL_ERROR "ocre-sdk not found at ${OCRE_SDK_PATH}. Please ensure the ocre-sdk directory exists and contains CMakeLists.txt")
19-
endif()
7+
add_executable(sensor.wasm main.c)
208

21-
add_subdirectory(${OCRE_SDK_PATH} ocre-sdk-build)
9+
add_subdirectory(../../../ocre-sdk ocre-sdk)
2210

23-
add_executable(${APPNAME}.wasm main.c)
24-
target_include_directories(${APPNAME}.wasm PRIVATE ocre_api)
25-
target_link_libraries(${APPNAME}.wasm PRIVATE ocre_api)
11+
target_link_libraries(sensor.wasm
12+
PUBLIC
13+
ocre_api
14+
)

0 commit comments

Comments
 (0)