merged 5G-MAG development branch

.gitignore

@@ -36,6 +36,7 @@ docs
 
 # cmake build directory
 build
+cmake-build-debug
 
 # VIM files
 # Swap
@@ -57,3 +58,6 @@ Sessionx.vim
 tags
 # Persistent undo
 [._]*.un~
+
+#Clion
+.idea

.gitmodules

@@ -1,4 +1,8 @@
 [submodule "lib/srsran"]
 	path = lib/srsran
-	url = ../srsRAN
+	url = ../srsRAN_4G
 	branch = fembms
+[submodule "supporting_files/rt-common-shared"]
+	path = supporting_files/rt-common-shared
+	url = https://github.com/5G-MAG/rt-common-shared
+	branch = feature/mbms

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project (modem VERSION 1.2.0)
+project (modem VERSION 1.2.2)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -68,8 +68,8 @@ target_link_libraries( modem
 
 install(TARGETS modem)
 install(FILES supporting_files/5gmag-rt-modem.service DESTINATION /usr/lib/systemd/system)
-install(FILES supporting_files/5gmag-rt.conf DESTINATION /etc)
-install(FILES supporting_files/5gmag-rt DESTINATION /etc/default)
+install(FILES supporting_files/rt-common-shared/mbms/common-config/5gmag-rt.conf DESTINATION /etc)
+install(FILES supporting_files/rt-common-shared/mbms/common-config/5gmag-rt DESTINATION /etc/default)
 install(FILES supporting_files/pre_modem.sh DESTINATION /usr/share/5gmag-rt
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
   )