diff --git a/.cproject b/.cproject
index 8c80bd0..4841eac 100644
--- a/.cproject
+++ b/.cproject
@@ -9,6 +9,7 @@
+
@@ -19,15 +20,12 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -98,6 +95,7 @@
+
@@ -109,7 +107,7 @@
-
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fe055f..3f61bce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.3)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake)
-include(cmake/GitFunctions.cmake)
+include(GitFunctions)
get_branch_from_git()
### set the directory names of the submodules
@@ -45,7 +45,7 @@ setup_conan()
find_package(Threads)
find_package(Tcmalloc)
-set(PROJECT_3PARTY_DIRS external sr_report sr_signal)
+set(PROJECT_3PARTY_DIRS external)
include(clang-format)
add_subdirectory(external)
diff --git a/dbt-core b/dbt-core
index 2450e0f..11ec5ce 160000
--- a/dbt-core
+++ b/dbt-core
@@ -1 +1 @@
-Subproject commit 2450e0f3e3fdf2466247cbeac585f5b8680079d4
+Subproject commit 11ec5cecc1e07b1401830c06d86fe88e3c246b46
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 8972513..b218b89 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1,6 +1,5 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.3)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
-set(CMAKE_CXX_STANDARD 14)
# Set the name of your project here
project("external")
diff --git a/riscv.sc/CMakeLists.txt b/riscv.sc/CMakeLists.txt
index 5236f99..e022264 100644
--- a/riscv.sc/CMakeLists.txt
+++ b/riscv.sc/CMakeLists.txt
@@ -1,7 +1,6 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.3)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) # main (top) cmake dir
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # project specific cmake dir
-set(CMAKE_CXX_STANDARD 14) # tODO move up to a general cmake config for all sub projects ?
# CMake useful variables
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
diff --git a/riscv/CMakeLists.txt b/riscv/CMakeLists.txt
index f311c99..965ed25 100644
--- a/riscv/CMakeLists.txt
+++ b/riscv/CMakeLists.txt
@@ -1,7 +1,6 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.3)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) # main (top) cmake dir
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # project specific cmake dir
-set(CMAKE_CXX_STANDARD 14) # tODO move up to a general cmake config for all sub projects ?
# CMake useful variables
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
@@ -68,7 +67,6 @@ include_directories(
${PROJECT_SOURCE_DIR}/incl
${PROJECT_SOURCE_DIR}/../external/elfio
${PROJECT_SOURCE_DIR}/../external/libGIS
- ${PROJECT_SOURCE_DIR}/../external/easyloggingpp/src
${Boost_INCLUDE_DIRS}
)
diff --git a/sc-components b/sc-components
index d4653d0..9d993c1 160000
--- a/sc-components
+++ b/sc-components
@@ -1 +1 @@
-Subproject commit d4653d028cec23a4d2ab63f1c213ac627393c7cf
+Subproject commit 9d993c15a45b442aaad5a20c9b087c21ceac5b07
diff --git a/simple-system.json b/simple-system.json
index 01855f0..250a235 100644
--- a/simple-system.json
+++ b/simple-system.json
@@ -6,8 +6,6 @@
"i_uart1":{
"write_to_ws": false
},
- "i_gpio0":{
- "write_to_ws": true
- }
+ "i_gpio0.write_to_ws": true
}
}