Merge commit '9bf3d9b'

2021-02-04 21:08:14 +04:00 · 2021-02-04 21:08:14 +04:00 · d888e1d4b5
commit d888e1d4b5
parent 695fabda68 9bf3d9b638
2 changed files with 9 additions and 0 deletions
--- a/external/ton/CMakeLists.txt
+++ b/external/ton/CMakeLists.txt
@ -55,3 +55,11 @@ target_link_libraries(external_ton
 INTERFACE
    ${ton_libs_list}
 )
+
+if (WIN32)
+    target_link_libraries(external_ton
+    INTERFACE
+        Psapi
+        Normaliz
+    )
+endif()
--- a/options.cmake
+++ b/options.cmake
@ -10,6 +10,7 @@ add_library(desktop-app::common_options ALIAS common_options)
 target_compile_definitions(common_options
 INTERFACE
    $<IF:$<CONFIG:Debug>,_DEBUG,NDEBUG>
+    QT_NO_CAST_FROM_BYTEARRAY
 )

 if (DESKTOP_APP_DISABLE_CRASH_REPORTS)