mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-27 19:45:43 +03:00
refact1
This commit is contained in:
@@ -30,14 +30,14 @@ find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
|
|||||||
find_package(Qt5 COMPONENTS Xml REQUIRED)
|
find_package(Qt5 COMPONENTS Xml REQUIRED)
|
||||||
find_package(Qt5 COMPONENTS Concurrent REQUIRED)
|
find_package(Qt5 COMPONENTS Concurrent REQUIRED)
|
||||||
|
|
||||||
add_subdirectory(DataBaseInterface)
|
add_subdirectory(LibDataBaseInterface)
|
||||||
add_subdirectory(InstructorsAndTrainees)
|
add_subdirectory(LibInstructorsAndTrainees)
|
||||||
|
add_subdirectory(LibServer)
|
||||||
add_subdirectory(ProgramAWSinstructorMPS)
|
add_subdirectory(ProgramAWSinstructorMPS)
|
||||||
add_subdirectory(Server)
|
|
||||||
add_subdirectory(ProgramServerMPS)
|
add_subdirectory(ProgramServerMPS)
|
||||||
|
|
||||||
add_dependencies(InstructorsAndTrainees DataBaseInterface)
|
add_dependencies(InstructorsAndTrainees DataBaseInterface)
|
||||||
add_dependencies(ProgramAWSinstructorMPS InstructorsAndTrainees)
|
|
||||||
add_dependencies(Server DataBaseInterface)
|
add_dependencies(Server DataBaseInterface)
|
||||||
add_dependencies(Server InstructorsAndTrainees)
|
add_dependencies(Server InstructorsAndTrainees)
|
||||||
|
add_dependencies(ProgramAWSinstructorMPS InstructorsAndTrainees)
|
||||||
add_dependencies(ProgramServerMPS Server)
|
add_dependencies(ProgramServerMPS Server)
|
||||||
|
|||||||
@@ -50,26 +50,26 @@ if(PROJECT_TYPE_DEBUG)
|
|||||||
add_custom_command(TARGET DataBaseInterface
|
add_custom_command(TARGET DataBaseInterface
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
${REPO_PATH}/BUILDS/Debug64/DataBaseInterface/libDataBaseInterface.dll
|
${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll
|
||||||
${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)
|
${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)
|
||||||
|
|
||||||
add_custom_command(TARGET DataBaseInterface
|
add_custom_command(TARGET DataBaseInterface
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
${REPO_PATH}/BUILDS/Debug64/DataBaseInterface/libDataBaseInterface.dll
|
${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll
|
||||||
${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS)
|
${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS)
|
||||||
else()
|
else()
|
||||||
|
|
||||||
add_custom_command(TARGET DataBaseInterface
|
add_custom_command(TARGET DataBaseInterface
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
${REPO_PATH}/BUILDS/Release64/DataBaseInterface/libDataBaseInterface.dll
|
${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll
|
||||||
${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)
|
${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)
|
||||||
|
|
||||||
add_custom_command(TARGET DataBaseInterface
|
add_custom_command(TARGET DataBaseInterface
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
${REPO_PATH}/BUILDS/Release64/DataBaseInterface/libDataBaseInterface.dll
|
${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll
|
||||||
${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS)
|
${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -163,11 +163,11 @@ target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_
|
|||||||
|
|
||||||
target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY)
|
target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY)
|
||||||
|
|
||||||
target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseInterface)
|
target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
|
||||||
if(PROJECT_TYPE_DEBUG)
|
if(PROJECT_TYPE_DEBUG)
|
||||||
target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface)
|
target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
|
||||||
else()
|
else()
|
||||||
target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseInterface)
|
target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
|
||||||
endif()
|
endif()
|
||||||
target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseInterface.dll)
|
target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseInterface.dll)
|
||||||
|
|
||||||
@@ -175,24 +175,24 @@ if(PROJECT_TYPE_DEBUG)
|
|||||||
add_custom_command(TARGET InstructorsAndTrainees
|
add_custom_command(TARGET InstructorsAndTrainees
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
|
${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
|
||||||
${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS)
|
${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS)
|
||||||
|
|
||||||
add_custom_command(TARGET InstructorsAndTrainees
|
add_custom_command(TARGET InstructorsAndTrainees
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
|
${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
|
||||||
${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)
|
${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)
|
||||||
else()
|
else()
|
||||||
add_custom_command(TARGET InstructorsAndTrainees
|
add_custom_command(TARGET InstructorsAndTrainees
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
|
${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
|
||||||
${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS)
|
${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS)
|
||||||
add_custom_command(TARGET InstructorsAndTrainees
|
add_custom_command(TARGET InstructorsAndTrainees
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
|
${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
|
||||||
${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)
|
${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user