From 74201b71b4962f4b5b75dcaf3b81f08300b884bb Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Mon, 12 Sep 2022 18:04:00 +0800
Subject: [PATCH] opt: windows build type & use generator expression

---
 flutter/linux/CMakeLists.txt          |  2 +-
 flutter/windows/CMakeLists.txt        |  7 +++++++
 flutter/windows/runner/CMakeLists.txt | 19 -------------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/flutter/linux/CMakeLists.txt b/flutter/linux/CMakeLists.txt
index 08d557f1b..9a4e0527b 100644
--- a/flutter/linux/CMakeLists.txt
+++ b/flutter/linux/CMakeLists.txt
@@ -125,7 +125,7 @@ foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
 endforeach(bundled_library)
 
 # flutter_rust_bridge
-set(RUSTDESK_LIB_BUILD_TYPE debug)
+set(RUSTDESK_LIB_BUILD_TYPE $<IF:$<CONFIG:Debug>,debug,release>)
 string(TOLOWER ${CMAKE_BUILD_TYPE} ${RUSTDESK_LIB_BUILD_TYPE})
 message(STATUS "rustdesk lib build type: ${RUSTDESK_LIB_BUILD_TYPE}")
 
diff --git a/flutter/windows/CMakeLists.txt b/flutter/windows/CMakeLists.txt
index 3d4e30586..89f0925f3 100644
--- a/flutter/windows/CMakeLists.txt
+++ b/flutter/windows/CMakeLists.txt
@@ -86,6 +86,13 @@ if(PLUGIN_BUNDLED_LIBRARIES)
     COMPONENT Runtime)
 endif()
 
+# flutter_rust_bridge
+set(RUSTDESK_LIB_BUILD_TYPE $<IF:$<CONFIG:Debug>,debug,release>)
+message(STATUS "rustdesk lib build type: ${RUSTDESK_LIB_BUILD_TYPE}")
+set(RUSTDESK_LIB "../../target/${RUSTDESK_LIB_BUILD_TYPE}/librustdesk.dll")
+install(FILES "${RUSTDESK_LIB}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+COMPONENT Runtime RENAME librustdesk.dll)
+
 # Fully re-copy the assets directory on each build to avoid having stale files
 # from a previous install.
 set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
diff --git a/flutter/windows/runner/CMakeLists.txt b/flutter/windows/runner/CMakeLists.txt
index bcaa06d73..b9e550fba 100644
--- a/flutter/windows/runner/CMakeLists.txt
+++ b/flutter/windows/runner/CMakeLists.txt
@@ -16,25 +16,6 @@ add_executable(${BINARY_NAME} WIN32
   "runner.exe.manifest"
 )
 
-# flutter_rust_bridge with Corrosion
-find_package(Corrosion REQUIRED)
-
-corrosion_import_crate(MANIFEST_PATH ../../../Cargo.toml
-        # Equivalent to --all-features passed to cargo build
-#        [ALL_FEATURES]
-        # Equivalent to --no-default-features passed to cargo build
-#        [NO_DEFAULT_FEATURES]
-        # Disable linking of standard libraries (required for no_std crates).
-#        [NO_STD]
-        # Specify  cargo build profile (e.g. release or a custom profile)
-#        [PROFILE <cargo-profile>]
-        # Only import the specified crates from a workspace
-#        [CRATES <crate1> ... <crateN>]
-        # Enable the specified features
-#        [FEATURES <feature1> ... <featureN>]
-)
-target_link_libraries(${BINARY_NAME} PRIVATE librustdesk)
-
 # Apply the standard set of build settings. This can be removed for applications
 # that need different build settings.
 apply_standard_settings(${BINARY_NAME})