9 files changed, 24 insertions(+), 15 deletions(-)

M .gitmodules
M module-bluetooth/Bluetooth/WorkerController.cpp
M module-bluetooth/CMakeLists.txt
M module-services/service-evtmgr/CMakeLists.txt
M module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp
D module-utils/sml
M third-party/CMakeLists.txt
A third-party/sml/CMakeLists.txt
A third-party/sml/src

@@ 72,7 72,7 @@
 	path = module-utils/parallel-hashmap
 	url = https://github.com/greg7mdp/parallel-hashmap.git
 [submodule "module-utils/sml"]
-	path = module-utils/sml
+	path = third-party/sml/src
 	url = https://github.com/boost-ext/sml
 [submodule "tools/misc"]
 	path = tools/misc

@@ 8,7 8,7 @@
 
 #include <module-utils/log/log.hpp>
 #define BOOST_SML_CFG_DISABLE_MIN_SIZE // GCC10 fix
-#include <module-utils/sml/include/boost/sml.hpp>
+#include <boost/sml.hpp>
 #include <magic_enum.hpp>
 #include <stdexcept>
 

@@ 68,16 68,17 @@ target_include_directories(
 )
 
 target_link_libraries(${PROJECT_NAME}
-    service-evtmgr
+    ${BOARD_DIR_LIBRARIES}
+    module-audio
     module-bsp
-    service-bluetooth
+    module-sys
     module-utils
     module-vfs
-    module-sys
-    module-audio
     service-audio
-    ${BOARD_DIR_LIBRARIES}
-    )
+    service-bluetooth
+    service-evtmgr
+    sml::sml
+)
 
 if (${ENABLE_TESTS})
     add_subdirectory(tests)

@@ 21,14 21,14 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
-        service-audio
+        module-apps
+        module-gui
+        module-utils
         service-appmgr
+        service-audio
         service-cellular
         service-desktop
-        module-apps
-        module-utils
-        module-gui
-
+        sml::sml
 )
 
 if (${ENABLE_TESTS})

@@ 9,7 9,7 @@
 #include <Utils.hpp>
 
 #define BOOST_SML_CFG_DISABLE_MIN_SIZE // GCC10 fix
-#include <module-utils/sml/include/boost/sml.hpp>
+#include <boost/sml.hpp>
 
 namespace battery_level_check
 {

@@ 1,1 0,0 @@
-Subproject commit 9666ff0646dbd506b531771acdf4ebf503dfbc5a

@@ 4,3 4,4 @@ add_subdirectory(magic_enum)
 add_subdirectory(microtar)
 add_subdirectory(date)
 add_subdirectory(pugixml)
+add_subdirectory(sml)

@@ 0,0 1,7 @@
+add_library(sml INTERFACE)
+add_library(sml::sml ALIAS sml)
+
+target_include_directories(sml
+    INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/include>
+)

@@ 0,0 1,1 @@
+Subproject commit 9666ff0646dbd506b531771acdf4ebf503dfbc5a