From ce337ae6c8fde3317490a276e72a59e23c729416 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 15 Jan 2025 09:43:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20CMakeLists.txt=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20Release64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB_IaT/InstructorsAndTrainees/CMakeLists.txt | 21 ++++++--- DB_LMS/DataBaseLMS/CMakeLists.txt | 48 ++++++++++++++++---- GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt | 4 +- ServerLMS/ServerLMS/CMakeLists.txt | 20 +++++--- TestServerLMS/TestServerLMS/CMakeLists.txt | 4 +- 5 files changed, 71 insertions(+), 26 deletions(-) diff --git a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt index bdf31ae..75a5c22 100644 --- a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt +++ b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt @@ -122,16 +122,25 @@ target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_ if(PROJECT_TYPE_DEBUG) target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64) elseif() - target_link_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/DB_LMS/Release64) + target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64) endif() target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseLMS.dll) -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/GUIdataBaseLMS/Debug64) +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/GUIdataBaseLMS/Debug64) +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/GUIdataBaseLMS/Release64) +endif() +#Только для TSMP! #install(TARGETS InstructorsAndTrainees DESTINATION ${VEYON_LIB_DIR}) diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt b/DB_LMS/DataBaseLMS/CMakeLists.txt index c18d4d1..ee0fd13 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt +++ b/DB_LMS/DataBaseLMS/CMakeLists.txt @@ -12,6 +12,14 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(PROJECT_TYPE_DEBUG TRUE) +endif() + +if(PROJECT_TYPE_DEBUG) + add_definitions(-DPROJECT_TYPE_DEBUG) +endif() + find_package(Qt5 COMPONENTS Widgets REQUIRED) find_package(Qt5 COMPONENTS Sql REQUIRED) find_package(Qt5 COMPONENTS LinguistTools REQUIRED) @@ -46,14 +54,34 @@ target_link_libraries(DataBaseLMS PRIVATE Qt5::Sql) target_compile_definitions(DataBaseLMS PRIVATE DATABASELMS_LIBRARY) message("${REPO_PATH}") -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/TestServerLMS/Debug64) -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/GUIdataBaseLMS/Debug64) +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/TestServerLMS/Debug64) + + 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/GUIdataBaseLMS/Debug64) +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/TestServerLMS/Release64) + + 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/GUIdataBaseLMS/Release64) +endif() + + + diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt index 4031e01..48ee309 100644 --- a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt +++ b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt @@ -51,7 +51,7 @@ target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ if(PROJECT_TYPE_DEBUG) target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_IaT/Debug64) elseif() - target_link_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/DB_IaT/Release64) + target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_IaT/Release64) endif() target_link_libraries(GUIdataBaseLMS PRIVATE libInstructorsAndTrainees.dll) @@ -60,6 +60,6 @@ target_include_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ if(PROJECT_TYPE_DEBUG) target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64) elseif() - target_link_directories(GUIdataBaseLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/DB_LMS/Release64) + target_link_directories(GUIdataBaseLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64) endif() target_link_libraries(GUIdataBaseLMS PRIVATE libDataBaseLMS.dll) diff --git a/ServerLMS/ServerLMS/CMakeLists.txt b/ServerLMS/ServerLMS/CMakeLists.txt index 492cb4d..e09d171 100644 --- a/ServerLMS/ServerLMS/CMakeLists.txt +++ b/ServerLMS/ServerLMS/CMakeLists.txt @@ -73,7 +73,7 @@ target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../DB if(PROJECT_TYPE_DEBUG) target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64) elseif() - target_link_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../BUILDS/LMS/DB_LMS/Release64) + target_link_directories(ServerLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64) endif() target_link_libraries(ServerLMS PRIVATE libDataBaseLMS.dll) @@ -81,8 +81,16 @@ target_link_libraries(ServerLMS PRIVATE libDataBaseLMS.dll) target_compile_definitions(ServerLMS PRIVATE SERVERLMS_LIBRARY) -add_custom_command(TARGET ServerLMS - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/ServerLMS/Debug64/libServerLMS.dll - ${REPO_PATH}/BUILDS/TestServerLMS/Debug64) +if(PROJECT_TYPE_DEBUG) + add_custom_command(TARGET ServerLMS + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${REPO_PATH}/BUILDS/ServerLMS/Debug64/libServerLMS.dll + ${REPO_PATH}/BUILDS/TestServerLMS/Debug64) +elseif() + add_custom_command(TARGET ServerLMS + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${REPO_PATH}/BUILDS/ServerLMS/Release64/libServerLMS.dll + ${REPO_PATH}/BUILDS/TestServerLMS/Release64) +endif() diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt b/TestServerLMS/TestServerLMS/CMakeLists.txt index 0f4c974..9c69ead 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt +++ b/TestServerLMS/TestServerLMS/CMakeLists.txt @@ -46,7 +46,7 @@ target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../. if(PROJECT_TYPE_DEBUG) target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Debug64) elseif() - target_link_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/DB_LMS/Release64) + target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/DB_LMS/Release64) endif() target_link_libraries(TestServerLMS PRIVATE libDataBaseLMS.dll) @@ -54,6 +54,6 @@ target_include_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../. if(PROJECT_TYPE_DEBUG) target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/ServerLMS/Debug64) elseif() - target_link_directories(TestServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../QT/BUILDS/LMS/ServerLMS/Release64) + target_link_directories(TestServerLMS PUBLIC ${REPO_PATH}/BUILDS/ServerLMS/Release64) endif() target_link_libraries(TestServerLMS PRIVATE libServerLMS.dll)