Skip to content

Commit 1075414

Browse files
committed
Dependency to Arduino is optional
1 parent c3edda3 commit 1075414

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,11 @@ cmake_minimum_required(VERSION 3.16)
22

33
# set the project name
44
project(arduino_helix)
5-
include(FetchContent)
65

76
# lots of warnings and all warnings as errors
87
## add_compile_options(-Wall -Wextra )
98
set(CMAKE_CXX_STANDARD 17)
109

11-
# Build with Linux Arduino Emulator
12-
FetchContent_Declare(arduino_emulator GIT_REPOSITORY "https://github.com/pschatzmann/Arduino-Emulator.git" GIT_TAG main )
13-
FetchContent_GetProperties(arduino_emulator)
14-
if(NOT arduino_emulator_POPULATED)
15-
FetchContent_Populate(arduino_emulator)
16-
add_subdirectory(${arduino_emulator_SOURCE_DIR})
17-
endif()
18-
19-
2010
file(GLOB_RECURSE SRC_LIST_C CONFIGURE_DEPENDS "${PROJECT_SOURCE_DIR}/src/*.c" )
2111

2212
# define libraries
@@ -28,9 +18,6 @@ target_compile_options(arduino_helix PRIVATE -DUSE_DEFAULT_STDLIB)
2818
# define location for header files
2919
target_include_directories(arduino_helix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/libhelix-mp3 ${CMAKE_CURRENT_SOURCE_DIR}/src/libhelix-aac )
3020

31-
# specify libraries
32-
target_link_libraries(arduino_helix arduino_emulator)
33-
3421
# build examples
3522
add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/examples/output_mp3")
3623
add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/examples/output_aac")

examples/output_aac/CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,24 @@ cmake_minimum_required(VERSION 3.16)
22

33
# set the project name
44
project(aac)
5+
include(FetchContent)
6+
57
set (DCMAKE_CXX_FLAGS -Werror -Wall -Wextra)
68
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
79
set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
810

11+
# Build with Linux Arduino Emulator
12+
FetchContent_Declare(arduino_emulator GIT_REPOSITORY "https://github.com/pschatzmann/Arduino-Emulator.git" GIT_TAG main )
13+
FetchContent_GetProperties(arduino_emulator)
14+
if(NOT arduino_emulator_POPULATED)
15+
FetchContent_Populate(arduino_emulator)
16+
add_subdirectory(${arduino_emulator_SOURCE_DIR} arduino-emulator)
17+
endif()
18+
19+
920
# build sketch as executable
1021
add_executable (aac desktop_aac.cpp )
1122
target_compile_options(aac PRIVATE -DEMULATOR)
1223

1324
# specify libraries
14-
target_link_libraries(aac arduino_helix)
25+
target_link_libraries(aac arduino_helix arduino_emulator)

examples/output_mp3/CMakeLists.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,24 @@ cmake_minimum_required(VERSION 3.16)
22

33
# set the project name
44
project(mp3)
5+
include(FetchContent)
6+
57
set (DCMAKE_CXX_FLAGS -Werror -Wall -Wextra)
68
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
79
set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
810

11+
# Build with Linux Arduino Emulator
12+
FetchContent_Declare(arduino_emulator GIT_REPOSITORY "https://github.com/pschatzmann/Arduino-Emulator.git" GIT_TAG main )
13+
FetchContent_GetProperties(arduino_emulator)
14+
if(NOT arduino_emulator_POPULATED)
15+
FetchContent_Populate(arduino_emulator)
16+
add_subdirectory(${arduino_emulator_SOURCE_DIR} arduino-emulator)
17+
endif()
18+
919
# build sketch as executable
1020
add_executable (mp3 desktop_mp3.cpp )
1121
target_compile_options(mp3 PRIVATE -DEMULATOR)
1222

1323
# specify libraries
14-
target_link_libraries(mp3 arduino_helix)
24+
target_link_libraries(mp3 arduino_helix arduino_emulator)
1525

0 commit comments

Comments
 (0)