Skip to content

Commit 9a1143e

Browse files
newdigatenewdigate
committed
fetch content local
1 parent 5ef7aa6 commit 9a1143e

8 files changed

+68
-30
lines changed

‎CMakeLists.arm.include.txt

-8
This file was deleted.

‎README.md

+24-12
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,24 @@
2424
#teensy compiler options
2525
set(COMPILERPATH "/Applications/ARM/bin/")
2626
27-
include(FetchContent)
28-
FetchContent_Declare(teensy_cmake_macros
29-
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
30-
GIT_TAG main
31-
)
32-
FetchContent_MakeAvailable(teensy_cmake_macros)
33-
message(INFO ${teensy_cmake_macros_SOURCE_DIR})
34-
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.arm.include.txt)
27+
set(BUILD_FOR_TEENSY ON)
28+
set(CMAKE_SYSTEM_NAME Generic)
29+
set(CMAKE_SYSTEM_PROCESSOR arm)
30+
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
31+
set(CMAKE_C_COMPILER ${COMPILERPATH}arm-none-eabi-gcc)
32+
set(CMAKE_CXX_COMPILER ${COMPILERPATH}arm-none-eabi-g++)
33+
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_C_COMPILER} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
3534
```
36-
* add include in your CMakeLists.txt file
37-
```cmake
38-
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
39-
```
35+
* add include in your CMakeLists.txt file
36+
```cmake
37+
include(FetchContent)
38+
FetchContent_Declare(teensy_cmake_macros
39+
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
40+
GIT_TAG main
41+
)
42+
FetchContent_MakeAvailable(teensy_cmake_macros)
43+
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
44+
```
4045
* specify toolchain file in cmake configuration stage
4146
```shell
4247
> cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE:FILEPATH="../cmake/toolchains/teensy41.cmake`
@@ -52,6 +57,13 @@
5257
```cmake
5358
cmake_minimum_required(VERSION 3.5)
5459
project(midi_smf_reader C CXX)
60+
61+
include(FetchContent)
62+
FetchContent_Declare(teensy_cmake_macros
63+
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
64+
GIT_TAG main
65+
)
66+
FetchContent_MakeAvailable(teensy_cmake_macros)
5567
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
5668
5769
import_arduino_library(cores ${teensy_cores_SOURCE_DIR}/teensy4 avr util)

‎tests/audio/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(test_teensy_project_audio)
33

4+
include(FetchContent)
5+
FetchContent_Declare(teensy_cmake_macros
6+
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
7+
GIT_TAG main
8+
)
9+
FetchContent_MakeAvailable(teensy_cmake_macros)
410
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
511

612
import_arduino_library(cores ${teensy_cores_SOURCE_DIR}/teensy4 avr util)

‎tests/basic/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(test_teensy_project_basic)
33

4+
include(FetchContent)
5+
FetchContent_Declare(teensy_cmake_macros
6+
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
7+
GIT_TAG main
8+
)
9+
FetchContent_MakeAvailable(teensy_cmake_macros)
410
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
511

612
import_arduino_library(cores ${teensy_cores_SOURCE_DIR}/teensy4 avr util)

‎tests/eeprom/CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(test_teensy_eeprom)
3+
4+
include(FetchContent)
5+
FetchContent_Declare(teensy_cmake_macros
6+
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
7+
GIT_TAG main
8+
)
9+
FetchContent_MakeAvailable(teensy_cmake_macros)
310
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
411

512
import_arduino_library(cores ${teensy_cores_SOURCE_DIR}/teensy4 avr util)

‎tests/spi/CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(test_teensy_eeprom)
3+
4+
include(FetchContent)
5+
FetchContent_Declare(teensy_cmake_macros
6+
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
7+
GIT_TAG main
8+
)
9+
FetchContent_MakeAvailable(teensy_cmake_macros)
310
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
11+
412
import_arduino_library(cores ${teensy_cores_SOURCE_DIR}/teensy4 avr util)
513
import_arduino_library_git(SPI https://github.com/PaulStoffregen/SPI master "")
614
teensy_add_executable(spiapp spiapp.cpp)

‎tests/teensy41.toolchain.cmake

+9-10
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ set(CPU_CORE_SPEED 600000000 CACHE STRING "Set to 24000000, 48000000, 72000000 o
33
set(CMAKE_EXE_LINKER_FLAGS "--specs=nosys.specs" CACHE INTERNAL "")
44

55
#teensy compiler options
6-
set(COMPILERPATH "/opt/gcc-arm-none-eabi-9-2019-q4-major/bin/")
7-
#set(COMPILERPATH "/Applications/ARM/bin/")
6+
#set(COMPILERPATH "/opt/gcc-arm-none-eabi-9-2019-q4-major/bin/")
7+
set(COMPILERPATH "/Applications/ARM/bin/")
88

9-
include(FetchContent)
10-
FetchContent_Declare(teensy_cmake_macros
11-
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
12-
GIT_TAG main
13-
)
14-
FetchContent_MakeAvailable(teensy_cmake_macros)
15-
message(INFO ${teensy_cmake_macros_SOURCE_DIR})
16-
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.arm.include.txt)
9+
set(BUILD_FOR_TEENSY ON)
10+
set(CMAKE_SYSTEM_NAME Generic)
11+
set(CMAKE_SYSTEM_PROCESSOR arm)
12+
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
13+
set(CMAKE_C_COMPILER ${COMPILERPATH}arm-none-eabi-gcc)
14+
set(CMAKE_CXX_COMPILER ${COMPILERPATH}arm-none-eabi-g++)
15+
set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_C_COMPILER} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

‎tests/vector/CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(test_teensy_project_vector)
3+
4+
include(FetchContent)
5+
FetchContent_Declare(teensy_cmake_macros
6+
GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
7+
GIT_TAG main
8+
)
9+
FetchContent_MakeAvailable(teensy_cmake_macros)
310
include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.include.txt)
11+
412
set(CMAKE_EXE_LINKER_FLAGS "--specs=nano.specs" CACHE INTERNAL "")
513
import_arduino_library(cores ${teensy_cores_SOURCE_DIR}/teensy4 avr util)
614
teensy_add_executable(vector vector.cpp)

0 commit comments

Comments
 (0)