Fix the CMake warning related to CMP0175 policy and improve the overall CMake configuration using modern practices. (#322)

Author: MohamedSonata

example/windows/flutter/CMakeLists.txt

@@ -9,6 +9,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
 # https://github.com/flutter/flutter/issues/57146.
 set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
 
+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
 # === Flutter Library ===
 set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
 
@@ -91,7 +96,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E env
     ${FLUTTER_TOOL_ENVIRONMENT}
     "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
-      windows-x64 $<CONFIG>
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
   VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS

example/windows/flutter/generated_plugins.cmake

@@ -0,0 +1,26 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  screen_retriever
+  webview_windows
+  window_manager
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

example/windows/runner/Runner.rc

@@ -60,14 +60,14 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 // Version
 //
 
-#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
 #else
-#define VERSION_AS_NUMBER 1,0,0
+#define VERSION_AS_NUMBER 1,0,0,0
 #endif
 
-#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif

windows/CMakeLists.txt

@@ -1,4 +1,10 @@
 cmake_minimum_required(VERSION 3.15)
+
+# Set CMP0175 to NEW to properly handle add_custom_command arguments
+if(POLICY CMP0175)
+  cmake_policy(SET CMP0175 NEW)
+endif()
+
 set(PROJECT_NAME "webview_windows")
 
 set(WIL_VERSION "1.0.220914.1")
@@ -15,6 +21,7 @@ set(PLUGIN_NAME "webview_windows_plugin")
 set(NUGET_URL https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe)
 set(NUGET_SHA256 852b71cc8c8c2d40d09ea49d321ff56fd2397b9d6ea9f96e532530307bbbafd3)
 
+# Find or download NuGet
 find_program(NUGET nuget)
 if(NOT NUGET)
   message(NOTICE "Nuget is not installed.")
@@ -30,15 +37,21 @@ if(NOT NUGET)
   endif()
 endif()
 
+# Create custom target for dependencies
 add_custom_target(${PROJECT_NAME}_DEPENDENCIES_DOWNLOAD ALL)
+
+# Download dependencies using NuGet
+# Note: Removed DEPENDS keyword from TARGET version of add_custom_command
 add_custom_command(
   TARGET ${PROJECT_NAME}_DEPENDENCIES_DOWNLOAD PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E echo "Downloading dependencies..."
   COMMAND ${NUGET} install Microsoft.Windows.ImplementationLibrary -Version ${WIL_VERSION} -ExcludeVersion -OutputDirectory ${CMAKE_BINARY_DIR}/packages
   COMMAND ${NUGET} install Microsoft.Web.WebView2 -Version ${WEBVIEW_VERSION} -ExcludeVersion -OutputDirectory ${CMAKE_BINARY_DIR}/packages
-  DEPENDS ${NUGET}
+  COMMENT "Downloading and installing NuGet packages"
 )
 
-add_library(${PLUGIN_NAME} SHARED
+# Define source files
+set(PLUGIN_SOURCES
   "webview_windows_plugin.cc"
   "webview_platform.cc"
   "webview.cc"
@@ -52,25 +65,40 @@ add_library(${PLUGIN_NAME} SHARED
   "util/string_converter.cc"
 )
 
+# Create the plugin library
+add_library(${PLUGIN_NAME} SHARED ${PLUGIN_SOURCES})
+
+# Configure compiler options
 if(MSVC)
   target_compile_options(${PLUGIN_NAME} PRIVATE "/await")
 endif()
 
+# Apply standard settings
 apply_standard_settings(${PLUGIN_NAME})
-target_compile_features(${PLUGIN_NAME} PUBLIC cxx_std_20) # For std::format support
 
-set_target_properties(${PLUGIN_NAME} PROPERTIES CXX_VISIBILITY_PRESET hidden)
+# Set C++ standard to 20 for std::format support
+target_compile_features(${PLUGIN_NAME} PUBLIC cxx_std_20)
 
-target_link_libraries(${PLUGIN_NAME} PRIVATE ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets)
-target_link_libraries(${PLUGIN_NAME} PRIVATE ${CMAKE_BINARY_DIR}/packages/Microsoft.Windows.ImplementationLibrary/build/native/Microsoft.Windows.ImplementationLibrary.targets)
+# Configure visibility
+set_target_properties(${PLUGIN_NAME} PROPERTIES 
+  CXX_VISIBILITY_PRESET hidden
+)
+
+# Add dependencies
+target_link_libraries(${PLUGIN_NAME} PRIVATE 
+  ${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2/build/native/Microsoft.Web.WebView2.targets
+  ${CMAKE_BINARY_DIR}/packages/Microsoft.Windows.ImplementationLibrary/build/native/Microsoft.Windows.ImplementationLibrary.targets
+  flutter 
+  flutter_wrapper_plugin
+)
 
+# Configure definitions and includes
 target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL)
 target_include_directories(${PLUGIN_NAME} INTERFACE
   "${CMAKE_CURRENT_SOURCE_DIR}/include"
 )
 
-target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin)
-
+# Set bundled libraries
 set(webview_windows_bundled_libraries
   PARENT_SCOPE
-)
+)