Merge pull request #56 from QuasarApp/heart_refactoring

Separate nodes and parsers

.gitignore

@@ -54,12 +54,12 @@ CMakeCache.txt
 CMakeFiles/
 *_autogen
 
-Heart/Heart_autogen/
-Heart/cmake_install.cmake
+src/Heart_autogen/
+src/cmake_install.cmake
 HeartTests/cmake_install.cmake
 cmake_install.cmake
 docs/
-Heart/heart_global.h
-
+src/heart_global.h
+doxygen.conf
 # git 
 *.orig

.gitmodules

@@ -1,4 +1,6 @@
-[submodule "QuasarAppLib"]
-	path = QuasarAppLib
+[submodule "submodules/crc"]
+	path = submodules/crc
+	url = /~https://github.com/QuasarApp/crc.git
+[submodule "submodules/QuasarAppLib"]
+	path = submodules/QuasarAppLib
 	url = /~https://github.com/QuasarApp/QuasarAppLib.git
-

CMakeLists.txt

@@ -13,8 +13,8 @@ if(TARGET ${PROJECT_NAME})
   return()
 endif()
 
-include(QuasarAppLib/CMake/QuasarApp.cmake)
-include(QuasarAppLib/CMake/Version.cmake)
+include(submodules/QuasarAppLib/CMake/QuasarApp.cmake)
+include(submodules/QuasarAppLib/CMake/Version.cmake)
 
 if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
     if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32")
@@ -23,26 +23,14 @@ if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
     endif()
 endif()
 
-if(NOT DEFINED HEART_BUILD_LVL)
-    set(HEART_BUILD_LVL 1)
-endif()
-
-if (NOT DEFINED HEART_TESTS)
-    set(HEART_TESTS ON)
+updateGitVars()
+set(HEART_VERSION 1.2.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH})
 
-    if (ANDROID OR IOS)
-        set(HEART_TESTS OFF)
-    endif()
-endif()
-
-if (NOT DEFINED HEART_DB_CACHE)
-    set(HEART_DB_CACHE OFF)
-
-    if (ANDROID OR WIN32)
-        set(HEART_DB_CACHE OFF)
-    endif()
+if (ANDROID OR IOS)
+    option(HEART_TESTS "Enable or disable tests of the heart library" OFF)
+else()
+    option(HEART_TESTS "Enable or disable tests of the heart library" ON)
 endif()
-
 # Use only for android debug builds with debugging from usb.
 option(HEART_STATIC_SSL "This option enable or disabled static link ssl libraryes" OFF)
 option(CMAKE_SHARE "This option enable or disabled ssl functions of nodes" OFF)
@@ -54,22 +42,20 @@ else()
     option(HEART_SSL "This option enable or disabled ssl functions of nodes" ON)
 endif()
 
-
-if (HEART_DB_CACHE)
-    add_definitions(-DHEART_DB_CACHE)
-endif()
-
 # Add sub directories
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Network Sql Concurrent REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Sql Concurrent REQUIRED)
 
-add_subdirectory(QuasarAppLib)
-add_subdirectory(Heart)
+add_subdirectory(submodules/QuasarAppLib)
+add_subdirectory(submodules/crc)
+add_subdirectory(src)
 
 if (HEART_TESTS)
     add_subdirectory(HeartTests)
 endif()
 
 initAll()
 
+configure_file_in(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
 addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
+