From e192c71104fb06229b6555e1e409d62669494952 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 14 Mar 2025 07:15:21 +0100 Subject: [PATCH 1/2] updates submodules and adds cmake presets --- .gitignore | 1 + CMakePresets.json | 39 +++++++++++++++++++++++++++++++++++++++ dbt-rise-core | 2 +- dbt-rise-tgc | 2 +- scc | 2 +- 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 CMakePresets.json diff --git a/.gitignore b/.gitignore index 577e7ef..7070260 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /.direnv /TGC_C_XRB/ /.envrc.eyck +/.cache \ No newline at end of file diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..b782560 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,39 @@ +{ + "version": 3, + "cmakeMinimumRequired": { + "major": 3, + "minor": 21, + "patch": 0 + }, + "configurePresets": [ + { + "name": "Debug", + "displayName": "Debug build", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build/${presetName}", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + }, + { + "name": "Release", + "displayName": "Release build", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build/${presetName}", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + } + ], + "buildPresets": [ + { + "name": "Debug", + "description": "Debug build", + "displayName": "Debug" + } + ] +} \ No newline at end of file diff --git a/dbt-rise-core b/dbt-rise-core index b9da8fa..01d81b0 160000 --- a/dbt-rise-core +++ b/dbt-rise-core @@ -1 +1 @@ -Subproject commit b9da8fa4c10af7ba2e794934c0eee3581e3bd046 +Subproject commit 01d81b03fbe6d5d3ed7f4655b88655a1e124df1f diff --git a/dbt-rise-tgc b/dbt-rise-tgc index 9f5326c..2384274 160000 --- a/dbt-rise-tgc +++ b/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit 9f5326c1103700b4fdd97389b9a9ad431af845d2 +Subproject commit 23842742a6a3ff449d75be688eaca41f3a69c46b diff --git a/scc b/scc index a37bde5..7960982 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit a37bde57190bdba96b82e4f95869a09bc3773784 +Subproject commit 7960982947592b1bd97b71c5615a5e2b82a920c0 From 4a74a73bee355415728e8e524fc5e683e48f9e4f Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 14 Mar 2025 19:45:21 +0100 Subject: [PATCH 2/2] updates CMakeLists.txt and dbt-rise-tgc submodule --- CMakeLists.txt | 2 +- dbt-rise-tgc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e13795e..fecd113 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,7 +213,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS") FetchContent_Declare( riscvfw GIT_REPOSITORY https://git.minres.com/Firmware/Firmwares.git - GIT_TAG main + GIT_TAG develop GIT_SHALLOW OFF UPDATE_DISCONNECTED ON ) diff --git a/dbt-rise-tgc b/dbt-rise-tgc index 2384274..502f3e8 160000 --- a/dbt-rise-tgc +++ b/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit 23842742a6a3ff449d75be688eaca41f3a69c46b +Subproject commit 502f3e8df9f4c44e79bb1b6fd8c2ec8e42c8de94