Merge remote-tracking branch 'origin/noinstall' into noinstall

Author: newdigate

CMakeLists.txt

@@ -41,24 +41,6 @@ function(teensy_set_dynamic_properties)
     if (NOT DEFINED teensy_set_dynamic_properties_has_executed)
         set(teensy_set_dynamic_properties_has_executed 1 CACHE INTERNAL "teensy_set_dynamic_properties_has_executed")
         message(STATUS "teensy_set_dynamic_properties()")
-        
-        message(CHECK_START "identify root dependency path")
-        if (NOT DEFINED DEPSPATH)
-            message(FATAL_ERROR "DEPSPATH is UNDEFINED")
-        else()
-            message(STATUS "DEPSPATH: ${DEPSPATH}")    
-        endif()
-        message(CHECK_PASS "identified")
-
-
-
-        if (NOT DEFINED COREPATH)
-            set(COREPATH "${DEPSPATH}/cores/teensy4/")
-            set(COREPATH ${COREPATH} CACHE INTERNAL "COREPATH")
-            message(STATUS "COREPATH: ${COREPATH}")
-        else()
-            message(STATUS "COREPATH: ${COREPATH}")    
-        endif()
 
         if (NOT DEFINED CPU_CORE_SPEED)
             message(FATAL_ERROR "CPU_CORE_SPEED is UNDEFINED")
@@ -108,7 +90,7 @@ function(teensy_set_dynamic_properties)
         elseif(TEENSY_VERSION EQUAL 41)
             message(STATUS "building for teensy 4.1")
             set(CPU_DEFINE __IMXRT1062__)
-            set(LINKER_FILE ${COREPATH}imxrt1062_t41.ld)
+            set(LINKER_FILE ${teensy_cores_SOURCE_DIR}/teensy4/imxrt1062_t41.ld)
             set(build_board TEENSY41)
             set(build_flags_ld " -Wl,--gc-sections,--relax ")
             set(build_core teensy4)
@@ -262,7 +244,9 @@ function(teensy_add_library TARGET)
     endforeach(SOURCE_S ${SOURCES_S})
 
     add_library(${ELFTARGET} STATIC ${ARGN} ${TEENSY_SOURCES} ${TEENSY_LIB_CPP_SOURCES} ${TEENSY_LIB_C_SOURCES} ${TEENSY_LIB_S_SOURCES})
-    set_target_properties(${ELFTARGET} PROPERTIES INCLUDE_DIRECTORIES ${COREPATH})
+    if (COREPATH)
+        set_target_properties(${ELFTARGET} PROPERTIES INCLUDE_DIRECTORIES ${COREPATH})
+    endif ()
     set_target_properties(${ELFTARGET} PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
 
     add_custom_command(OUTPUT ${TARGET}.hex 
@@ -366,14 +350,14 @@ macro(import_arduino_library_git LIB_NAME LIB_URL LIB_BRANCH LIB_PATH)
             GIT_TAG        ${LIB_BRANCH}
     )
     FetchContent_MakeAvailable(${LIB_NAME})
-    set(LIB_ROOT "${${LIB_NAME}_SOURCE_DIR}/${LIB_PATH}")
+    string(TOLOWER ${LIB_NAME} LIB_NAME_LOWER)
+    set(LIB_ROOT "${${LIB_NAME_LOWER}_SOURCE_DIR}/${LIB_PATH}")
 
-    message(STATUS "import_arduino_library_git(${LIB_NAME} ${LIB_URL} ${LIB_BRANCH} ${LIB_ROOT} ${ARGN})")
     # Check if we can find the library.
     if(NOT EXISTS "${LIB_ROOT}")
         message(STATUS "Could not find the directory for library '${LIB_ROOT}' -- ignoring (its possible that the library is not used for the target you are calling) !!!!!")
     else()
         import_arduino_library(${LIB_NAME} ${LIB_ROOT} ${ARGN})
     endif(NOT EXISTS "${LIB_ROOT}")
 
-endmacro(import_arduino_library_git)
+endmacro(import_arduino_library_git)

README.md

@@ -12,6 +12,37 @@
 * targetting Teensy 4.x, tested on Teensy 4.1 (should be easy to extend for 3.x)
 * compiles library code to .a archive files to avoid unnecessary recompiling
 
+ * add a toolchain cmake file `cmake\toolchains\teensy41.cmake`
+   <details>
+    
+   ```cmake
+   set(TEENSY_VERSION 41 CACHE STRING "Set to the Teensy version corresponding to your board (30 or 31 allowed)" FORCE)
+   set(CPU_CORE_SPEED 600000000 CACHE STRING "Set to 24000000, 48000000, 72000000 or 96000000 to set CPU core speed" FORCE) # Derived variables
+   set(CMAKE_EXE_LINKER_FLAGS "--specs=nano.specs" CACHE INTERNAL "")
+   #teensy compiler options
+   set(COMPILERPATH "/Applications/ARM/bin/")
+   
+   add_definitions(-DTEENSY_VERSION=${TEENSY_VERSION})
+   include(FetchContent)
+   
+   FetchContent_Declare(teensy_cores
+           GIT_REPOSITORY https://github.com/PaulStoffregen/cores
+           GIT_TAG        master
+   )
+   FetchContent_MakeAvailable(teensy_cores)
+   
+   FetchContent_Declare(teensy_cmake_macros
+           GIT_REPOSITORY https://github.com/newdigate/teensy-cmake-macros
+           GIT_TAG        noinstall
+   )
+   FetchContent_MakeAvailable(teensy_cmake_macros)
+   include(${teensy_cmake_macros_SOURCE_DIR}/CMakeLists.txt)
+   set(BUILD_FOR_TEENSY ON)
+   ``` 
+    </details>
+
+`cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE:FILEPATH="../cmake/toolchains/teensy41.cmake`
+
 ## TL/DR
 <details>
   <summary>install build dependencies (click to expand) </summary>