Make building the webapp container mandatory

As otherwise desktop files generated by angelfish won't work.

CMakeLists.txt

@@ -5,7 +5,6 @@ set(KF5_MIN_VERSION "5.18.0")
 set(QT_MIN_VERSION "5.5.0")
 
 option(BUILD_TESTING "Build test programs" ON)
-option(BUILD_WEBAPP_CONTAINER "Build webapp container" ON)
 
 ################# Disallow in-source build #################
 
@@ -33,7 +32,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
 ################# Find dependencies #################
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Svg QuickControls2 Sql)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 Purpose I18n Config)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 Purpose I18n Config CoreAddons)
 
 # Necessary to support QtWebEngine installed in a different prefix than the rest of Qt (e.g flatpak)
 find_package(Qt5WebEngine REQUIRED)
@@ -48,9 +47,7 @@ add_subdirectory(src)
 if (BUILD_TESTING)
     add_subdirectory(autotests)
 endif()
-if (BUILD_WEBAPP_CONTAINER)
-	add_subdirectory(angelfish-webapp)
-endif()
+add_subdirectory(angelfish-webapp)
 
 install(PROGRAMS org.kde.mobile.angelfish.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.mobile.angelfish.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})

angelfish-webapp/CMakeLists.txt

-find_package(KF5 REQUIRED COMPONENTS CoreAddons)
-
 set(angelfish_webapp_SRCS
     main.cpp
     ../src/browsermanager.cpp