ref #30 fix structure targets

CMakeLists.txt

@@ -23,37 +23,38 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)
 
-include(submodules/CMake/ccache.cmake)
-include(submodules/CMake/QuasarAppCITargets.cmake)
+include(submodules/QuasarAppLib/CMake/QuasarApp.cmake)
 
-# Add sub directories
-add_subdirectory(src)
-
-if (NOT DEFINED SnakeProject_TESTS)
-    set(SnakeProject_TESTS ON)
+if (NOT DEFINED SNAKEPROJECT_TESTS)
+    set(SNAKEPROJECT_TESTS ON)
 
     if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
         if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32")
-            set(SnakeProject_TESTS OFF)
+            set(SNAKEPROJECT_TESTS OFF)
         endif()
     endif()
 
     if (ANDROID)
-        set(SnakeProject_TESTS OFF)
+        set(SNAKEPROJECT_TESTS OFF)
     endif()
 
     if (NOT QT_VERSION_MAJOR)
-        set(SnakeProject_TESTS OFF)
+        set(SNAKEPROJECT_TESTS OFF)
     endif()
 endif()
 
+# Add sub directories
 
-if (SnakeProject_TESTS)
+add_subdirectory(src/ClientLib)
+add_subdirectory(src/Client)
+
+if (SNAKEPROJECT_TESTS)
     add_subdirectory(tests)
 else()
     message("The ${PROJECT_NAME} tests is disabled.")
 endif()
 
+
 initAll()
 
 addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)

src/CMakeLists.txt

@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2020-2021 QuasarApp.
-# Distributed under the lgplv3 software license, see the accompanying
-# Everyone is permitted to copy and distribute verbatim copies
-# of this license document, but changing it is not allowed.
-#
-
-cmake_minimum_required(VERSION 3.14)
-
-
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-
-include(../submodules/CMake/ProjectOut.cmake)
-include(../submodules/CMake/Version.cmake)
-include(../submodules/CMake/QtUtils.cmake)
-include(../submodules/CMake/crossplatform/crossplatform.cmake)
-
-add_subdirectory(Library)
-add_subdirectory(Example)

src/ClientLib/CMakeLists.txt

@@ -42,7 +42,5 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts)
 
 prepareQM(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
 
-setVersion(0 0 1)
-
 set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE)
 

tests/CMakeLists.txt

@@ -9,8 +9,6 @@ cmake_minimum_required(VERSION 3.14)
 
 set(CURRENT_PROJECT ${PROJECT_NAME}Test)
 
-include(../submodules/CMake/ProjectOut.cmake)
-
 
 file(GLOB SOURCE_CPP
     "*.cpp" "*.qrc"