Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/work-branch' into startIntegrate

Browse Source 
# Conflicts:
#	DOCS/.obsidian/workspace.json
This commit is contained in:
semenov
2025-01-15 09:51:12 +03:00
parent f530d1b0f4 ce337ae6c8
commit 59568bd883
20 changed files with 243 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ServerLMS/ServerLMS/CMakeLists.txt
View File

@@ -81,7 +81,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)
@@ -89,8 +89,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()