From f63b2d75c4cf919c217454140dad2e63589aa402 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 16 Apr 2025 12:52:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20CMakeLists.txt=20=D0=B4=D0=BB=D1=8F=20Release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt.user.08851f6 | 423 ++++++++++++++++++++++++++ DataBaseLMS/CMakeLists.txt | 2 +- DataBaseLMS/databaselms.cpp | 4 +- GUIdataBaseLMS/CMakeLists.txt | 4 +- InstructorsAndTrainees/CMakeLists.txt | 4 +- ServerLMS/CMakeLists.txt | 4 +- TestServerLMS/CMakeLists.txt | 4 +- desktop.ini | 2 - 8 files changed, 435 insertions(+), 12 deletions(-) create mode 100644 CMakeLists.txt.user.08851f6 delete mode 100644 desktop.ini diff --git a/CMakeLists.txt.user.08851f6 b/CMakeLists.txt.user.08851f6 new file mode 100644 index 0000000..6c4c660 --- /dev/null +++ b/CMakeLists.txt.user.08851f6 @@ -0,0 +1,423 @@ + + + + + + EnvironmentId + {08851f69-ba1e-4324-82d1-68caa9ee1f99} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 1 + + + CMAKE_BUILD_TYPE:STRING=Debug + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + D:/LOCAL_REP_RRJ_SERVER/RRJServer/BUILDS/Debug64 + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Отладка + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Release + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + D:/LOCAL_REP_RRJ_SERVER/RRJServer/BUILDS/Release64 + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=RelWithDebInfo + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + D:/LOCAL_REP_RRJ_SERVER/build-RRJServer-Desktop_Qt_5_14_2_MinGW_64_bit-RelWithDebInfo + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск с отладочной информацией + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=MinSizeRel + CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} + CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} + CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} + QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} + + D:/LOCAL_REP_RRJ_SERVER/build-RRJServer-Desktop_Qt_5_14_2_MinGW_64_bit-MinSizeRel + + + + + all + + true + CMakeProjectManager.MakeStep + + 1 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMakeProjectManager.MakeStep + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Выпуск минимального размера + CMakeProjectManager.CMakeBuildConfiguration + + 4 + + + 0 + Развёртывание + Развёртывание + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + GUIdataBaseLMS + CMakeProjectManager.CMakeRunConfiguration.GUIdataBaseLMS + GUIdataBaseLMS + + false + + false + true + true + false + false + true + + D:/LOCAL_REP_RRJ_SERVER/RRJServer/BUILDS/Debug64/GUIdataBaseLMS + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + TestServerLMS + CMakeProjectManager.CMakeRunConfiguration.TestServerLMS + TestServerLMS + + false + + false + true + true + false + false + true + + D:/LOCAL_REP_RRJ_SERVER/RRJServer/BUILDS/Debug64/TestServerLMS + + 2 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/DataBaseLMS/CMakeLists.txt b/DataBaseLMS/CMakeLists.txt index a74f588..fb0c152 100644 --- a/DataBaseLMS/CMakeLists.txt +++ b/DataBaseLMS/CMakeLists.txt @@ -46,7 +46,7 @@ if(PROJECT_TYPE_DEBUG) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS/libDataBaseLMS.dll ${REPO_PATH}/BUILDS/Debug64/GUIdataBaseLMS) -elseif() +else() add_custom_command(TARGET DataBaseLMS POST_BUILD diff --git a/DataBaseLMS/databaselms.cpp b/DataBaseLMS/databaselms.cpp index 719c1f3..02fa7d0 100644 --- a/DataBaseLMS/databaselms.cpp +++ b/DataBaseLMS/databaselms.cpp @@ -26,7 +26,9 @@ bool DataBaseLMS::createConnection() db->setUserName(dbUserName); db->setPassword(dbPassword); db->setPort(5432); - db->setHostName("192.168.100.87"); + //db->setHostName("192.168.100.87"); + //db->setHostName("192.168.100.248"); + db->setHostName("192.168.100.239"); bool res = db->open(); diff --git a/GUIdataBaseLMS/CMakeLists.txt b/GUIdataBaseLMS/CMakeLists.txt index 1c0e023..5eeb9c7 100644 --- a/GUIdataBaseLMS/CMakeLists.txt +++ b/GUIdataBaseLMS/CMakeLists.txt @@ -25,7 +25,7 @@ target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/messanger) if(PROJECT_TYPE_DEBUG) target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees) -elseif() +else() target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees) endif() target_link_libraries(GUIdataBaseLMS PRIVATE libInstructorsAndTrainees.dll) @@ -34,7 +34,7 @@ target_link_libraries(GUIdataBaseLMS PRIVATE libInstructorsAndTrainees.dll) target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) if(PROJECT_TYPE_DEBUG) target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) -elseif() +else() target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) endif() target_link_libraries(GUIdataBaseLMS PRIVATE libDataBaseLMS.dll) diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index ad4daa0..2f416b3 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -113,7 +113,7 @@ target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) if(PROJECT_TYPE_DEBUG) target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) -elseif() +else() target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) endif() target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseLMS.dll) @@ -124,7 +124,7 @@ if(PROJECT_TYPE_DEBUG) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll ${REPO_PATH}/BUILDS/Debug64/GUIdataBaseLMS) -elseif() +else() add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different diff --git a/ServerLMS/CMakeLists.txt b/ServerLMS/CMakeLists.txt index 581477e..2e5eeaf 100644 --- a/ServerLMS/CMakeLists.txt +++ b/ServerLMS/CMakeLists.txt @@ -53,7 +53,7 @@ target_link_libraries(ServerLMS PRIVATE Qt5::Xml) target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) if(PROJECT_TYPE_DEBUG) target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) -elseif() +else() target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) endif() target_link_libraries(ServerLMS PRIVATE libDataBaseLMS.dll) @@ -66,7 +66,7 @@ if(PROJECT_TYPE_DEBUG) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REPO_PATH}/BUILDS/Debug64/ServerLMS/libServerLMS.dll ${REPO_PATH}/BUILDS/Debug64/TestServerLMS) -elseif() +else() add_custom_command(TARGET ServerLMS POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different diff --git a/TestServerLMS/CMakeLists.txt b/TestServerLMS/CMakeLists.txt index f6d3c77..97bcfea 100644 --- a/TestServerLMS/CMakeLists.txt +++ b/TestServerLMS/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(TestServerLMS PRIVATE Qt5::Xml) target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS) if(PROJECT_TYPE_DEBUG) target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseLMS) -elseif() +else() target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseLMS) endif() target_link_libraries(TestServerLMS PRIVATE libDataBaseLMS.dll) @@ -26,7 +26,7 @@ target_link_libraries(TestServerLMS PRIVATE libDataBaseLMS.dll) target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS) if(PROJECT_TYPE_DEBUG) target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/ServerLMS) -elseif() +else() target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/ServerLMS) endif() target_link_libraries(TestServerLMS PRIVATE libServerLMS.dll) diff --git a/desktop.ini b/desktop.ini deleted file mode 100644 index 3cc74f0..0000000 --- a/desktop.ini +++ /dev/null @@ -1,2 +0,0 @@ -[.ShellClassInfo] -IconResource=C:\Windows\System32\SHELL32.dll,9