From 64317ffef5a461c91c074805a20a7d497bd1a2cc Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Mon, 26 Dec 2022 17:15:45 +0300 Subject: [PATCH] fixed deploy service additional data for debug target --- client/CMakeLists.txt | 16 ++++++++-------- service/server/CMakeLists.txt | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index f6729d88..75a08af4 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -509,12 +509,12 @@ elseif(APPLE AND NOT IOS) set(DEPLOY_ARTIFACT_PATH "macos") endif() -if(NOT IOS) -add_custom_command( - TARGET ${PROJECT} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E $,copy_directory,true> - ${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH} - $ - COMMAND_EXPAND_LISTS -) +if(NOT IOS AND NOT ANDROID) + add_custom_command( + TARGET ${PROJECT} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E $,copy_directory,true> + ${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH} + $ + COMMAND_EXPAND_LISTS + ) endif() diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt index 330c4538..9936f890 100644 --- a/service/server/CMakeLists.txt +++ b/service/server/CMakeLists.txt @@ -97,9 +97,19 @@ if(NOT IOS) endif() # deploy artifacts required to run the application to the debug build folder -if(LINUX) - set(DEPLOY_ARTIFACT_PATH "linux/service") +if(WIN32) + if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") + set(DEPLOY_ARTIFACT_PATH "windows/x64") + else() + set(DEPLOY_ARTIFACT_PATH "windows/x32") + endif() +elseif(LINUX) + set(DEPLOY_ARTIFACT_PATH "linux/serivce") +elseif(APPLE AND NOT IOS) + set(DEPLOY_ARTIFACT_PATH "macos") +endif() +if(NOT IOS AND NOT ANDROID) add_custom_command( TARGET ${PROJECT} POST_BUILD COMMAND ${CMAKE_COMMAND} -E $,copy_directory,true>