Organize BLED112 code into separated module

Author: philippitts

CMakeLists.txt

@@ -1,22 +1,23 @@
-cmake_minimum_required (VERSION 3.10)
-project (OpenBCI_GUI_Helpers)
+cmake_minimum_required(VERSION 3.10)
+project(OpenBCI_GUI_Helpers)
 
-set (CMAKE_CXX_STANDARD 17)
-set (CMAKE_VERBOSE_MAKEFILE ON)
-set (BRAINFLOW_VERSION 2.1.0)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(BRAINFLOW_VERSION 2.1.0)
 
 # dont export sumbols on unix by default
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 
-macro (configure_msvc_runtime)
-    if (MSVC)
+macro(configure_msvc_runtime)
+    if(MSVC)
         # Default to statically-linked runtime.
-        if ("${MSVC_RUNTIME}" STREQUAL "")
-            set (MSVC_RUNTIME "static")
-        endif ()
+        if("${MSVC_RUNTIME}" STREQUAL "")
+            set(MSVC_RUNTIME "static")
+        endif()
+
         # Set compiler options.
-        set (variables
+        set(variables
             CMAKE_C_FLAGS_DEBUG
             CMAKE_C_FLAGS_MINSIZEREL
             CMAKE_C_FLAGS_RELEASE
@@ -26,52 +27,55 @@ macro (configure_msvc_runtime)
             CMAKE_CXX_FLAGS_RELEASE
             CMAKE_CXX_FLAGS_RELWITHDEBINFO
         )
-        if (${MSVC_RUNTIME} STREQUAL "static")
+
+        if(${MSVC_RUNTIME} STREQUAL "static")
             message(STATUS
                 "MSVC -> forcing use of statically-linked runtime."
             )
-            foreach (variable ${variables})
-                if (${variable} MATCHES "/MD")
-                    string (REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
-                endif ()
-            endforeach ()
-        else ()
-            message (STATUS
+
+            foreach(variable ${variables})
+                if(${variable} MATCHES "/MD")
+                    string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
+                endif()
+            endforeach()
+        else()
+            message(STATUS
                 "MSVC -> forcing use of dynamically-linked runtime."
             )
-            foreach (variable ${variables})
-                if (${variable} MATCHES "/MT")
-                    string (REGEX REPLACE "/MT" "/MD" ${variable} "${${variable}}")
-                endif ()
-            endforeach ()
-        endif ()
-    endif ()
-endmacro ()
+
+            foreach(variable ${variables})
+                if(${variable} MATCHES "/MT")
+                    string(REGEX REPLACE "/MT" "/MD" ${variable} "${${variable}}")
+                endif()
+            endforeach()
+        endif()
+    endif()
+endmacro()
 
 # link msvc runtime statically
-configure_msvc_runtime ()
+configure_msvc_runtime()
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/third_party/SimpleBLE/simpleble)
 
-SET (GANGLION_LIB "GanglionScan")
-set (GANGLION_SOURCE_LIB
-    ${CMAKE_HOME_DIRECTORY}/src/callbacks.cpp
-    ${CMAKE_HOME_DIRECTORY}/src/cmd_def.cpp
-    ${CMAKE_HOME_DIRECTORY}/src/stubs.cpp
-    ${CMAKE_HOME_DIRECTORY}/src/uart.cpp
-    ${CMAKE_HOME_DIRECTORY}/src/openbci_gui_helpers.cpp
+SET(GANGLION_LIB "GanglionScan")
+set(GANGLION_SOURCE_LIB
+    ${CMAKE_HOME_DIRECTORY}/modules/bglib/src/callbacks.cpp
+    ${CMAKE_HOME_DIRECTORY}/modules/bglib/src/cmd_def.cpp
+    ${CMAKE_HOME_DIRECTORY}/modules/bglib/src/stubs.cpp
+    ${CMAKE_HOME_DIRECTORY}/modules/bglib/src/uart.cpp
+    ${CMAKE_HOME_DIRECTORY}/modules/bglib/src/openbci_gui_helpers.cpp
 )
 
-add_library (${GANGLION_LIB} SHARED ${GANGLION_SOURCE_LIB})
+add_library(${GANGLION_LIB} SHARED ${GANGLION_SOURCE_LIB})
 
-target_include_directories (${GANGLION_LIB} PUBLIC
+target_include_directories(${GANGLION_LIB} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/third_party/json>
-    $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/src/inc>
+    $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/modules/bglib/include>
 )
 
-set_property (TARGET ${GANGLION_LIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_property(TARGET ${GANGLION_LIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-set_target_properties (${GANGLION_LIB}
+set_target_properties(${GANGLION_LIB}
     PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
     LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
@@ -84,24 +88,24 @@ set_target_properties (${GANGLION_LIB}
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
 )
 
-SET (GANGLION_NATIVE_LIB "GanglionNativeScan")
-set (GANGLION_NATIVE_SOURCE_LIB
-    ${CMAKE_HOME_DIRECTORY}/src/openbci_gui_native_helpers.cpp
+SET(GANGLION_NATIVE_LIB "GanglionNativeScan")
+set(GANGLION_NATIVE_SOURCE_LIB
+    ${CMAKE_HOME_DIRECTORY}/modules/openbci_gui_native_helpers.cpp
 )
 
-add_library (${GANGLION_NATIVE_LIB} SHARED ${GANGLION_NATIVE_SOURCE_LIB})
+add_library(${GANGLION_NATIVE_LIB} SHARED ${GANGLION_NATIVE_SOURCE_LIB})
 
-target_include_directories (${GANGLION_NATIVE_LIB} PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/src/inc>
+target_include_directories(${GANGLION_NATIVE_LIB} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/modules/inc>
     $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/third_party/json>
     $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/third_party/SimpleBLE/simpleble/include/simpleble>
 )
 
-target_link_libraries (${GANGLION_NATIVE_LIB} PRIVATE simpleble)
+target_link_libraries(${GANGLION_NATIVE_LIB} PRIVATE simpleble)
 
-set_property (TARGET ${GANGLION_NATIVE_LIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_property(TARGET ${GANGLION_NATIVE_LIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-set_target_properties (${GANGLION_NATIVE_LIB}
+set_target_properties(${GANGLION_NATIVE_LIB}
     PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
     LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/