From 0aca893f8ac8a9d7771fbfe73aea4cda603cb073 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sun, 5 Jun 2022 12:45:47 +0300
Subject: [PATCH] update cmake files

---
 CMakeLists.txt                       |  2 +-
 src/Example/CMakeLists.txt           | 18 ++++++++----------
 src/Example/Deploy/RENAME_ME.json.in |  2 +-
 src/Library/CMakeLists.txt           | 28 +++++++++++++---------------
 submodules/CMake                     |  2 +-
 tests/CMakeLists.txt                 | 12 +++++++-----
 6 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 713d069..09c6017 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@
 # of this license document, but changing it is not allowed.
 #
 
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 project(RENAME_ME LANGUAGES CXX)
 if(TARGET ${PROJECT_NAME})
   message("The ${PROJECT_NAME} arledy included in main Project")
diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt
index 7d56469..c429611 100644
--- a/src/Example/CMakeLists.txt
+++ b/src/Example/CMakeLists.txt
@@ -5,23 +5,21 @@
 # of this license document, but changing it is not allowed.
 #
 
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 
-set(CURRENT_PROJECT "${PROJECT_NAME}Eaxample")
+get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+
+set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}")
 option(SIGN_APP "This option enable od disabled sign apk and aab files" ON)
 
-file(GLOB SOURCE_CPP
+file(GLOB_RECURSE SOURCE_CPP
     "*.cpp" "*.h"
-     "Private/*.cpp"
-     "Private/*.h"
 )
 
 if (${QT_VERSION_MAJOR})
-    file(GLOB SOURCE_QRC
+    file(GLOB_RECURSE SOURCE_QRC
         "*.qrc"
-        "Private/*.qrc"
     )
-
 endif()
 
 set(ALL_SOURCES ${SOURCE_CPP} ${SOURCE_QRC})
@@ -45,7 +43,7 @@ else()
 
 endif()
 
-target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME})
+target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}Library)
 
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
 target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
@@ -61,7 +59,7 @@ if (ANDROID)
     set(OPENSSL_ROOT_PATH "$ENV{OPENSSL_ROOT_DIR}")
 
     set(RENAME_ME_EXTRA_LIBS
-        ${PROJECT_NAME}
+        ${PROJECT_NAME}Library
 #        libName
         )
 
diff --git a/src/Example/Deploy/RENAME_ME.json.in b/src/Example/Deploy/RENAME_ME.json.in
index b597672..45063d4 100644
--- a/src/Example/Deploy/RENAME_ME.json.in
+++ b/src/Example/Deploy/RENAME_ME.json.in
@@ -21,7 +21,7 @@
         ],
     "extraLib": "crypto",
     "targetDir": "@CMAKE_SOURCE_DIR@/Distro",
-    "deployVersion": "@RENAME_VERSION@",
+    "deployVersion": "@RENAME_ME_VERSION@",
 
 }
 
diff --git a/src/Library/CMakeLists.txt b/src/Library/CMakeLists.txt
index 7674abe..7cf9b6a 100644
--- a/src/Library/CMakeLists.txt
+++ b/src/Library/CMakeLists.txt
@@ -5,23 +5,21 @@
 # of this license document, but changing it is not allowed.
 #
 
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 
+get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+
+set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}")
 add_definitions(-DRENAME_ME_LIBRARY)
 
 
-file(GLOB SOURCE_CPP
-    "src/public/*.cpp"
-    "src/public/RENAME_ME/*.cpp"
-    "src/private/*.cpp"
-
-    "src/public/*.h"
-    "src/public/RENAME_ME/*.h"
-    "src/private/*.h"
+file(GLOB_RECURSE SOURCE_CPP
+    "src/*.cpp"
+    "src/*.h"
 )
 
 if (${QT_VERSION_MAJOR})
-    file(GLOB SOURCE_QRC
+    file(GLOB_RECURSE SOURCE_QRC
         "*.qrc"
     )
 
@@ -31,19 +29,19 @@ set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/public")
 set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/private")
 
 
-add_library(${PROJECT_NAME} ${SOURCE_CPP} ${SOURCE_QRC})
+add_library(${CURRENT_PROJECT} ${SOURCE_CPP} ${SOURCE_QRC})
 
 if (${QT_VERSION_MAJOR})
-    target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core )
+    target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt${QT_VERSION_MAJOR}::Core )
 endif()
 
-target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR})
-target_include_directories(${PROJECT_NAME} PRIVATE ${PRIVATE_INCUDE_DIR})
+target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
+target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
 
 set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts)
 
 
-prepareQM(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
+prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
 
 set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE)
 
diff --git a/submodules/CMake b/submodules/CMake
index e45bd71..4246ffe 160000
--- a/submodules/CMake
+++ b/submodules/CMake
@@ -1 +1 @@
-Subproject commit e45bd7179929a0f9ea198bdec28046ec5a855190
+Subproject commit 4246ffe2c7041669f1657d48d4a962452852b51b
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3d28aaa..0a2cbb0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,20 +5,22 @@
 # of this license document, but changing it is not allowed.
 #
 
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 
-set(CURRENT_PROJECT ${PROJECT_NAME}Test)
+get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 
-file(GLOB SOURCE_CPP
+set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}")
+
+file(GLOB_RECURSE SOURCE_CPP
     "*.cpp" "*.h" "*.qrc"
-    "units/*.cpp" "units/*.h" "units/*.qrc"
 )
+
 set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/units")
 
 
 add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
-target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test RENAME_ME)
+target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test ${PROJECT_NAME}Library)
 
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})