CMake Improvements

.gitattributes

@@ -9,3 +9,4 @@
 *.filters text eol=crlf
 *.props text eol=crlf
 *.xml text eol=crlf
+*.patch text eol=lf

.github/workflows/build.yml

@@ -31,11 +31,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
-        submodules: recursive    
+        submodules: recursive
     - name: Setup arm-none-eabi-gcc
-      uses: fiam/arm-none-eabi-gcc@v1
+      uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         release: '9-2019-q4'
     - name: Setup python
@@ -47,22 +47,56 @@ jobs:
     - name: Build Examples
       run: ./ci/build_examples.py -f core doc src tests Drivers
 
-  build-cmake:
+  build-cmake-gcc:
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        version: [latest, '13.3.Rel1', '12.3.Rel1', '11.3.Rel1', '10.3-2021.10', '9-2020-q2']
+
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: recursive
+
     - name: Setup arm-none-eabi-gcc
-      uses: fiam/arm-none-eabi-gcc@v1
+      uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
-        release: '9-2019-q4'
-    - name: Setup cmake
-      uses: jwlawson/[email protected]
-      with:
-        cmake-version: '3.20.x'
-    - name: Configure Library
-      run: cmake -S . -B build -G "Unix Makefiles" -D CMAKE_TOOLCHAIN_FILE=cmake/toolchains/stm32h750xx.cmake -D TOOLCHAIN_PREFIX=$(which arm-none-eabi-gcc | sed -e "s/bin\/arm-none-eabi-gcc//")
-    - name: Build Library
-      run: cmake --build build
+        release: ${{ matrix.version }}
+
+    - name: Setup CMake
+      uses: lukka/get-cmake@latest
+
+    - name: Configure
+      run: cmake -B build -G Ninja -D CMAKE_BUILD_TYPE=Release
+
+    - name: Build All
+      run: cmake --build build --target examples --verbose
+
+  build-cmake-llvm:
+      runs-on: ubuntu-latest
+
+      strategy:
+        matrix:
+          version: [latest, '19.1.1']
+
+      steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install LLVM Embedded Toolchain for Arm
+        uses: stellar-aria/llvm-embedded-toolchain-for-arm-action@latest
+        with:
+          release: ${{ matrix.version }}
+
+      - name: Setup CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Configure
+        run: cmake -B build -G Ninja -D CMAKE_BUILD_TYPE=Release
+
+      - name: Build All
+        run: cmake --build build --target BootloaderBlink --verbose # TODO: make this build all examples

.github/workflows/unit_tests.yaml

@@ -12,7 +12,7 @@ on:
     - 'src/**'
     - 'tests/**'
     - '.github/workflows/**'
-jobs:  
+jobs:
   ###############################################################################
   # builds the automated tests with clang; runs tests and exports results
   googleTest:
@@ -24,23 +24,25 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Build
-      run: |
-        cd tests
-        make release
-
+    - name: Setup CMake
+      uses: lukka/get-cmake@latest
+
+    - name: Configure CMake
+      run: cmake -B build -S tests
+
+    - name: Build Tests
+      run: cmake --build build
+
     - name: Run Tests
-      run: |
-        cd tests/build/bin
-        ./libDaisy_gtest --gtest_output=xml:gtestresults.xml
-
+      run: ctest --test-dir build --output-junit results/gtestresults.xml
+
     - name: Upload Test Results
       uses: actions/upload-artifact@v4
       if: always()
       with:
         name: Test Results
-        path: tests/build/bin/**/*.xml
-  
+        path: build/results/*.xml
+
   event_file:
     name: "Event File"
     runs-on: ubuntu-latest

.gitignore

@@ -118,7 +118,7 @@ LLVM/
 transcode report.txt
 /examples/*/build
 /example_projects/*/build
-/build
+/build*
 /doc/*.md
 /core/build
 /doc/html
@@ -129,6 +129,6 @@ VisualGDBCache
 vs/*.log
 
 tests/libDaisy_gtest
-tests/build/bin/
+tests/build/
 examples/**/build/
 

.vscode/extensions.json

@@ -1,8 +1,9 @@
 {
 	"recommendations": [
-        "ms-vscode.cpptools",
+		"ms-vscode.cpptools",
 		"xaver.clang-format",
-        "davidschuldenfrei.gtest-adapter",
-        "vadimcn.vscode-lldb"
+		"vadimcn.vscode-lldb",
+		"ms-vscode.cmake-tools",
+		"matepek.vscode-catch2-test-adapter",
 	]
-}
+}

.vscode/launch.json

@@ -15,7 +15,6 @@
             },
             "preLaunchTask": "build-libDaisy-tests",
             "osx": {
-                "type": "lldb",
                 "MIMode": "lldb",
             },
             "windows": {
@@ -48,9 +47,9 @@
                 "monitor reset"
             ],
             "request": "launch",
-            "runToMain": true,
+            "runToEntryPoint": "true",
             "servertype": "openocd",
-            "showDevDebugOutput": true,
+            "showDevDebugOutput": "none",
             "svdFile": "${workspaceRoot}/.vscode/STM32H750x.svd",
             "type": "cortex-debug"
         }

.vscode/settings.json

@@ -87,8 +87,9 @@
         ]
     },
     "testMate.cpp.test.executables": "tests/build/bin/*",
-    "gtest-adapter.debugConfig": [
-        "Launch Tests Locally"
+    "cmake.sourceDirectory": [
+        "${workspaceFolder}",
+        "${workspaceFolder}/tests",
     ],
-    "gtest-adapter.supportLocation": true,
-}
+    "cmake.buildDirectory": "${sourceDirectory}/build",
+}