From 0d80a4c11ed5debb9627cc57c733a213993520de Mon Sep 17 00:00:00 2001 From: slava Date: Wed, 11 Jun 2025 19:14:54 +0700 Subject: [PATCH] Fix for windows --- CMakeLists.txt | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 035a802..9eb9b9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,12 @@ cmake_minimum_required(VERSION 3.16) project(ARCDesktopProject LANGUAGES CXX) +#mkdir build +#cd build +#cmake .. -DCMAKE_PREFIX_PATH="C:/Qt/6.x.x/msvc2019_64" -DCMAKE_BUILD_TYPE=Release +#cmake --build . --config Release +#windeployqt .\Release\ARCDesktopProject.exe + set(CMAKE_CXX_STANDARD 17) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) @@ -55,7 +61,8 @@ file(GLOB_RECURSE ANDROID_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/android/*.h" ) -add_executable(ARCDesktopProject +if (WIN32) +add_executable(ARCDesktopProject WIN32 main.cpp ${VIEW_SOURCES} ${SERVICES_SOURCES} @@ -65,6 +72,18 @@ add_executable(ARCDesktopProject views/bank/BankSettingsWindow.cpp views/bank/BankSettingsWindow.h ) +elseif (APPLE) + add_executable(ARCDesktopProject + main.cpp + ${VIEW_SOURCES} + ${SERVICES_SOURCES} + ${DB_SOURCES} + ${MODELS_SOURCES} + ${ANDROID_SOURCES} + views/bank/BankSettingsWindow.cpp + views/bank/BankSettingsWindow.h + ) +endif () if (WIN32) target_link_libraries(ARCDesktopProject @@ -83,6 +102,32 @@ if (WIN32) file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/config.ini" DESTINATION "${CMAKE_BINARY_DIR}") file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/tools/adb/windows" DESTINATION "${CMAKE_BINARY_DIR}/tools/adb") + add_custom_command(TARGET ARCDesktopProject POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/database/app_data.db" + "$/database/app_data.db" + + COMMAND ${CMAKE_COMMAND} -E copy_directory + "${CMAKE_CURRENT_SOURCE_DIR}/tutorials" + "$/tutorials" + + COMMAND ${CMAKE_COMMAND} -E copy_directory + "${CMAKE_CURRENT_SOURCE_DIR}/images" + "$/images" + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/rus.traineddata" + "$/rus.traineddata" + + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/config.ini" + "$/config.ini" + + COMMAND ${CMAKE_COMMAND} -E copy_directory + "${CMAKE_CURRENT_SOURCE_DIR}/tools/adb/windows" + "$/tools/adb/windows" + ) + elseif (APPLE) target_link_libraries(ARCDesktopProject Qt6::Widgets