Merge branch 'master' into develop

Conflicts:
	.cproject
	.settings/language.settings.xml
	CMakeLists.txt
	examples/simple_system/gpio.cpp
	examples/simple_system/plic.cpp
	sc-components

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.12)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake)
 
 project(SCC_Test)
 
@@ -11,10 +11,10 @@ set(NO_SUBMODULE_CHECK FALSE CACHE BOOL "Disable the submodule check")
 
 set(ENABLE_CLANG_TIDY FALSE CACHE BOOL "Enable clang-tidy checks")
 include(GitFunctions)
-get_branch_from_git()
+get_info_from_git()
 
 ### set the directory names of the submodules
-set(GIT_SUBMODULES sc-components)
+set(GIT_SUBMODULES scc)
 set(GIT_SUBMODULE_DIR_sc-components .)
 ### set each submodules's commit or tag that is to be checked out
 ### (leave empty if you want master)
@@ -75,7 +75,7 @@ else()
 endif()
 endif()
 
-setup_conan()
+setup_conan(TARGETS)
 
 # This line finds the boost lib and headers. 
 set(Boost_NO_BOOST_CMAKE ON) #  Don't do a find_package in config mode before searching for a regular boost install.
@@ -89,7 +89,7 @@ endif()
 
 enable_testing()
 
-add_subdirectory(sc-components)
+add_subdirectory(scc)
 add_subdirectory(examples)
 add_subdirectory(tests)