mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
Сделал первый этап разделения Сервера и GUI
This commit is contained in:
@@ -21,19 +21,18 @@ find_package(Qt5 COMPONENTS Widgets REQUIRED)
|
||||
find_package(Qt5 COMPONENTS Network REQUIRED)
|
||||
find_package(Qt5 COMPONENTS Sql REQUIRED)
|
||||
find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
|
||||
find_package(Qt5 REQUIRED COMPONENTS Concurrent )
|
||||
find_package(Qt5 REQUIRED COMPONENTS Concurrent)
|
||||
find_package(Qt5 COMPONENTS Xml REQUIRED)
|
||||
|
||||
#set(TS_FILES ServerLMS_ru_RU.ts)
|
||||
|
||||
add_library(ServerLMS SHARED
|
||||
ServerLMS_global.h
|
||||
serverlmswidget.cpp
|
||||
serverlmswidget.h
|
||||
serverlmswidget.ui
|
||||
messangerwidget.cpp
|
||||
messangerwidget.h
|
||||
messangerwidget.ui
|
||||
# messangerwidget.cpp
|
||||
# messangerwidget.h
|
||||
# messangerwidget.ui
|
||||
typesDataServerClient.h
|
||||
Client.h
|
||||
clienthandler.cpp
|
||||
@@ -54,8 +53,9 @@ add_library(ServerLMS SHARED
|
||||
Systems/sendsystem.h
|
||||
Systems/tools.cpp
|
||||
Systems/tools.h
|
||||
providerdblms.cpp
|
||||
providerdblms.h
|
||||
resources.qrc
|
||||
#${TS_FILES}
|
||||
)
|
||||
|
||||
target_link_libraries(ServerLMS PRIVATE Qt5::Widgets)
|
||||
@@ -64,25 +64,6 @@ target_link_libraries(ServerLMS PRIVATE Qt5::Concurrent)
|
||||
target_link_libraries(ServerLMS PRIVATE Qt5::Sql)
|
||||
target_link_libraries(ServerLMS PRIVATE Qt5::Xml)
|
||||
|
||||
#target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../SUO/InstructorsAndTrainees)
|
||||
#target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../SUO/InstructorsAndTrainees/instructors)
|
||||
#target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../SUO/InstructorsAndTrainees/trainees)
|
||||
#target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../SUO/InstructorsAndTrainees/tasks)
|
||||
#target_link_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../SUO/Debug64)
|
||||
#target_link_libraries(ServerLMS PRIVATE libInstructorsAndTrainees.dll)
|
||||
|
||||
target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees)
|
||||
target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/instructors)
|
||||
target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/trainees)
|
||||
target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/tasks)
|
||||
target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/InstructorsAndTrainees/docTasks)
|
||||
if(PROJECT_TYPE_DEBUG)
|
||||
target_link_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/Debug64)
|
||||
elseif()
|
||||
target_link_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_IaT/Release64)
|
||||
endif()
|
||||
target_link_libraries(ServerLMS PRIVATE libInstructorsAndTrainees.dll)
|
||||
|
||||
|
||||
target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB_LMS/DataBaseLMS)
|
||||
if(PROJECT_TYPE_DEBUG)
|
||||
@@ -94,5 +75,3 @@ target_link_libraries(ServerLMS PRIVATE libDataBaseLMS.dll)
|
||||
|
||||
|
||||
target_compile_definitions(ServerLMS PRIVATE SERVERLMS_LIBRARY)
|
||||
|
||||
#qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
|
||||
|
||||
Reference in New Issue
Block a user