diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index a50243766f..04c8c8e1d2 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -140,11 +140,6 @@ if (UNIX) endif () endif () -if (MSVC) - list(APPEND REQUIRED_PACKAGES WebView2) -endif() - - list(APPEND SYSTEM_PROVIDED_PACKAGES ${${PROJECT_NAME}_PLATFORM_PACKAGES}) list(REMOVE_DUPLICATES SYSTEM_PROVIDED_PACKAGES) @@ -185,7 +180,7 @@ foreach (pkg ${FOUND_PACKAGES}) if (${pkg} IN_LIST SYSTEM_PROVIDED_PACKAGES) check_system_package(${pkg} _checked_list) - else () + elseif (TARGET dep_${pkg}) get_target_property(_is_excluded_from_all dep_${pkg} EXCLUDE_FROM_ALL) if (NOT _is_excluded_from_all) list(APPEND DEPS_TO_BUILD ${pkg}) @@ -194,6 +189,12 @@ foreach (pkg ${FOUND_PACKAGES}) endif () endforeach() +# This ugly append ensures that WebView2 was appended no matter what EXCLUDE_FROM_ALL is. +# (Webview2 is not added by add_cmake_project) +if (MSVC) + list(APPEND DEPS_TO_BUILD WebView2) +endif() + # Establish dependency graph foreach (pkg ${SUPPORTED_PACKAGES}) if (${pkg} IN_LIST DEPS_TO_BUILD)