Переделано под один мега-проект LMS с общим CMakeLists.txt

CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(LMS LANGUAGES CXX)
+
+add_subdirectory(DataBaseLMS)
+add_subdirectory(InstructorsAndTrainees)
+add_subdirectory(GUIdataBaseLMS)
+add_subdirectory(ServerLMS)
+add_subdirectory(TestServerLMS)
+
+add_dependencies(InstructorsAndTrainees DataBaseLMS)
+add_dependencies(GUIdataBaseLMS InstructorsAndTrainees)
+add_dependencies(ServerLMS DataBaseLMS)
+add_dependencies(TestServerLMS ServerLMS)

DataBaseLMS/CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(DataBaseLMS LANGUAGES CXX)
 
-get_filename_component(PROJECT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+get_filename_component(REPO_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(REPO_PATH ${PROJECT_PATH} DIRECTORY)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
@@ -60,27 +59,27 @@ if(PROJECT_TYPE_DEBUG)
     add_custom_command(TARGET DataBaseLMS
 	   POST_BUILD
 	   COMMAND ${CMAKE_COMMAND} -E copy_if_different
-	   ${REPO_PATH}/BUILDS/DB_LMS/Debug64/libDataBaseLMS.dll
+	   ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS/libDataBaseLMS.dll
-	   ${REPO_PATH}/BUILDS/TestServerLMS/Debug64)
+	   ${REPO_PATH}/BUILDS/Debug64/TestServerLMS)
 
     add_custom_command(TARGET DataBaseLMS
 	   POST_BUILD
 	   COMMAND ${CMAKE_COMMAND} -E copy_if_different
-	   ${REPO_PATH}/BUILDS/DB_LMS/Debug64/libDataBaseLMS.dll
+	   ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS/libDataBaseLMS.dll
-	   ${REPO_PATH}/BUILDS/GUIdataBaseLMS/Debug64)
+	   ${REPO_PATH}/BUILDS/Debug64/GUIdataBaseLMS)
 elseif()
 
     add_custom_command(TARGET DataBaseLMS
 	    POST_BUILD
 	    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-	    ${REPO_PATH}/BUILDS/DB_LMS/Release64/libDataBaseLMS.dll
+	    ${REPO_PATH}/BUILDS/Release64/DataBaseLMS/libDataBaseLMS.dll
-	    ${REPO_PATH}/BUILDS/TestServerLMS/Release64)
+	    ${REPO_PATH}/BUILDS/Release64/TestServerLMS)
 
     add_custom_command(TARGET DataBaseLMS
 	     POST_BUILD
 	     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-	     ${REPO_PATH}/BUILDS/DB_LMS/Release64/libDataBaseLMS.dll
+	     ${REPO_PATH}/BUILDS/Release64/DataBaseLMS/libDataBaseLMS.dll
-	     ${REPO_PATH}/BUILDS/GUIdataBaseLMS/Release64)
+	     ${REPO_PATH}/BUILDS/Release64/GUIdataBaseLMS)
 endif()
 
 

GUIdataBaseLMS/CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(GUIdataBaseLMS LANGUAGES CXX)
 
-get_filename_component(PROJECT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+get_filename_component(REPO_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(REPO_PATH ${PROJECT_PATH} DIRECTORY)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
@@ -40,26 +39,26 @@ target_link_libraries(GUIdataBaseLMS PRIVATE Qt5::Xml)
 target_link_libraries(GUIdataBaseLMS PRIVATE Qt5::Network)
 
 
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees)
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/instructors)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/instructors)
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/trainees)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/trainees)
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/tasks)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/tasks)
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/docTasks)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/docTasks)
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/connectorToServer)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/connectorToServer)
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/connectorToServer/Core)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/connectorToServer/Core)
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/messanger)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/messanger)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_IaT/Debug64)
+    target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees)
 elseif()
-    target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_IaT/Release64)
+    target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees)
 endif()
 target_link_libraries(GUIdataBaseLMS PRIVATE libInstructorsAndTrainees.dll)
 
 
-target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS)
+target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(GUIdataBaseLMS PUBLIC  ${REPO_PATH}/BUILDS/DB_LMS/Debug64)
+    target_link_directories(GUIdataBaseLMS PUBLIC  ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS)
 elseif()
-    target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64)
+    target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS)
 endif()
 target_link_libraries(GUIdataBaseLMS PRIVATE libDataBaseLMS.dll)

GUIdataBaseLMS/StaticData/authData.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AuthData Login="admin" Password="admin" InstructorName="Администратор" ClientName="Администратор" AccessType="instructor"/>

GUIdataBaseLMS/StaticData/settings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ServerSettingsContainer>
+    <ServerSettings Address="192.168.100.87" Port="6000" Language="RUS" AutoStart="0"/>
+</ServerSettingsContainer>

GUIdataBaseLMS/StaticData/temp.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ClientDeAutorization Login="admin"/>

InstructorsAndTrainees/CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(InstructorsAndTrainees LANGUAGES CXX)
 
-get_filename_component(PROJECT_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+get_filename_component(REPO_PATH ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(REPO_PATH ${PROJECT_PATH} DIRECTORY)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
@@ -118,11 +117,11 @@ target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_
 target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY)
 
 
-target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS)
+target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64)
+    target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS)
 elseif()
-    target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64)
+    target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS)
 endif()
 target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseLMS.dll)
 
@@ -131,14 +130,14 @@ if(PROJECT_TYPE_DEBUG)
     add_custom_command(TARGET InstructorsAndTrainees
 	               POST_BUILD
 		       COMMAND ${CMAKE_COMMAND} -E copy_if_different
-		     ${REPO_PATH}/BUILDS/DB_IaT/Debug64/libInstructorsAndTrainees.dll
+		     ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
-		     ${REPO_PATH}/BUILDS/GUIdataBaseLMS/Debug64)
+		     ${REPO_PATH}/BUILDS/Debug64/GUIdataBaseLMS)
 elseif()
     add_custom_command(TARGET InstructorsAndTrainees
 	               POST_BUILD
 		       COMMAND ${CMAKE_COMMAND} -E copy_if_different
-		     ${REPO_PATH}/BUILDS/DB_IaT/Release64/libInstructorsAndTrainees.dll
+		     ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
-		     ${REPO_PATH}/BUILDS/GUIdataBaseLMS/Release64)
+		     ${REPO_PATH}/BUILDS/Release64/GUIdataBaseLMS)
 endif()