From b4a40bd21c59836847ad911e03dc13dea6748130 Mon Sep 17 00:00:00 2001
From: Mateusz Grzegorzek <mateusz.grzegorzek@mudita.com>
Date: Tue, 25 May 2021 14:43:09 +0200
Subject: [PATCH] [BH-398] Move sml to a separate directory

Move sml to a separate directory
---
 .gitmodules                                         |  2 +-
 module-bluetooth/Bluetooth/WorkerController.cpp     |  2 +-
 module-bluetooth/CMakeLists.txt                     | 13 +++++++------
 module-services/service-evtmgr/CMakeLists.txt       | 10 +++++-----
 .../battery-level-check/BatteryLevelCheck.cpp       |  2 +-
 third-party/CMakeLists.txt                          |  1 +
 third-party/sml/CMakeLists.txt                      |  7 +++++++
 module-utils/sml => third-party/sml/src             |  0
 8 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 third-party/sml/CMakeLists.txt
 rename module-utils/sml => third-party/sml/src (100%)

diff --git a/.gitmodules b/.gitmodules
index d026b3813b044fcd1379c57854d7776f4c9df2cc..54e221fe1ef5bb7bf48026bbe91cb801db318ee5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/module-bluetooth/Bluetooth/WorkerController.cpp b/module-bluetooth/Bluetooth/WorkerController.cpp
index 1438152e046d8fb21041eb1b1f26241adad7a6bf..710ffaffa7078b879dc0cf58d1108c2937affd0d 100644
--- a/module-bluetooth/Bluetooth/WorkerController.cpp
+++ b/module-bluetooth/Bluetooth/WorkerController.cpp
@@ -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>
 
diff --git a/module-bluetooth/CMakeLists.txt b/module-bluetooth/CMakeLists.txt
index ad50d9a849aa315910083cbceee07ac6bd8610a3..e45135fd5a569055670c1e89d43c02ee588f0ecd 100644
--- a/module-bluetooth/CMakeLists.txt
+++ b/module-bluetooth/CMakeLists.txt
@@ -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)
diff --git a/module-services/service-evtmgr/CMakeLists.txt b/module-services/service-evtmgr/CMakeLists.txt
index 64abead2b1b1cb99addb22c4c8da6cf5512dd78c..5cb58835a9f6e8deb16271fccc3ea88c5d4b2124 100644
--- a/module-services/service-evtmgr/CMakeLists.txt
+++ b/module-services/service-evtmgr/CMakeLists.txt
@@ -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})
diff --git a/module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp b/module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp
index b9485e2a76f43ada861c3e20c11eeebee7eeb634..9b5d522be8f439e8727145b85ce617ecf4b8cc1d 100644
--- a/module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp
+++ b/module-services/service-evtmgr/battery-level-check/BatteryLevelCheck.cpp
@@ -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
 {
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index bfef8e50c1a83374fc43bc83ce6a0b6de7ce722c..ee0f81b62c957da47f6174558528387a77bc1c67 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -4,3 +4,4 @@ add_subdirectory(magic_enum)
 add_subdirectory(microtar)
 add_subdirectory(date)
 add_subdirectory(pugixml)
+add_subdirectory(sml)
diff --git a/third-party/sml/CMakeLists.txt b/third-party/sml/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b995662b1f4c1c0bd2b194a936d056e61bf01b8e
--- /dev/null
+++ b/third-party/sml/CMakeLists.txt
@@ -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>
+)
diff --git a/module-utils/sml b/third-party/sml/src
similarity index 100%
rename from module-utils/sml
rename to third-party/sml/src