11 files changed, 73 insertions, 32 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b2287e33..0fa6ea15a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,6 +354,22 @@ if(AVAHI_FOUND)
     add_definitions(-DHAVE_LIBAVAHI_CLIENT)
 endif()
 
+option(WITH_ICON_CACHE "Generate the icon cache during install target" ON)
+if(WITH_ICON_CACHE)
+    message(STATUS "Icon cache will be generated")
+    add_definitions(-DWITH_ICON_CACHE)
+else()
+    message(STATUS "Icons cache won't be generated automatically")
+endif()
+
+option(WITH_UPDATE_DESKTOP_DB "Generate desktop files MIME types cache database" ON)
+if(WITH_UPDATE_DESKTOP_DB)
+    message(STATUS "Desktop MIME types cache database enabled")
+    add_definitions(-DWITH_UPDATE_DESKTOP_DB)
+else()
+    message(STATUS "Desktop MIME types cache database won't be generated")
+endif()
+
 if(GTK_FOUND)
 	pkg_check_modules(gio REQUIRED gio-2.0)
 	pkg_check_modules(gio-unix REQUIRED gio-unix-2.0)
diff --git a/data/desktop/CMakeLists.txt b/data/desktop/CMakeLists.txt
index ca9142e75..5e650b1dd 100644
--- a/data/desktop/CMakeLists.txt
+++ b/data/desktop/CMakeLists.txt
@@ -160,14 +160,18 @@ if( SHARED_MIME_INFO_FOUND )
     install( FILES remmina-mime.xml DESTINATION ${XDG_MIME_INSTALL_DIR} )
     update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
 endif()
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
-find_program(PROG_UPDATE_DESKTOP_DATABASE update-desktop-database)
-if( PROG_UPDATE_DESKTOP_DATABASE )
-    install(
-        CODE
-        "message(STATUS \"Updating desktop file database\")"
-        CODE
-        "execute_process(COMMAND ${PROG_UPDATE_DESKTOP_DATABASE}
-        -q ${CMAKE_INSTALL_PREFIX}/share/applications)"
-        )
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
+if(WITH_UPDATE_DESKTOP_DB)
+    find_program(PROG_UPDATE_DESKTOP_DATABASE update-desktop-database)
+    if( PROG_UPDATE_DESKTOP_DATABASE )
+        install(
+            CODE
+            "message(STATUS \"Updating desktop file database\")"
+            CODE
+            "execute_process(COMMAND ${PROG_UPDATE_DESKTOP_DATABASE}
+            -q ${CMAKE_INSTALL_PREFIX}/share/applications)"
+            )
+    endif()
 endif()
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index dcce13eb5..b74f6ad09 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -66,4 +66,6 @@ set(APPICONSCALE_EMBLEMS_DATA
 install(FILES ${APPICONSCALE_ACTIONS_DATA} DESTINATION ${APPICONSCALE_ACTIONS_DIR})
 install(FILES ${APPICONSCALE_EMBLEMS_DATA} DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 4b757d1ff..6569b7b30 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -81,20 +81,25 @@ if(SPICE_FOUND)
     add_subdirectory(spice)
 endif()
 
-pkg_search_module(WEBKIT2
-    webkit2gtk-4.0
-    webkit2gtk-3.0
-    libwebkit2gtk-4.0
-    libwebkit2gtk-3.0
-    )
-
-if(WEBKIT2_FOUND)
-	message(STATUS "Enabling WWW plugin.")
-	add_definitions(-DWITH_WWW)
-	add_subdirectory(www)
-else(WEBKIT2_FOUND)
-	message(WARNING "WEBKIT not found")
-endif(WEBKIT2_FOUND)
+option(WITH_WWW "Build WWW plugin" ON)
+if(WITH_WWW)
+    message(STATUS "Enabling WWW plugin.")
+    add_definitions(-DWITH_WWW)
+    pkg_search_module(WEBKIT2
+        webkit2gtk-4.0
+        webkit2gtk-3.0
+        libwebkit2gtk-4.0
+        libwebkit2gtk-3.0
+        )
+    if(WEBKIT2_FOUND)
+        message(STATUS "WWW plugin dependencies found")
+        add_subdirectory(www)
+    else(WEBKIT2_FOUND)
+        message(WARNING "WEBKIT not found")
+    endif(WEBKIT2_FOUND)
+else()
+    message(STATUS "Disabling WWW plugin.")
+endif()
 
 if(WITH_EXAMPLES)
     message(STATUS "Enabling examples and test plugins.")
diff --git a/plugins/nx/CMakeLists.txt b/plugins/nx/CMakeLists.txt
index 39644dbaf..604c0a20e 100644
--- a/plugins/nx/CMakeLists.txt
+++ b/plugins/nx/CMakeLists.txt
@@ -61,4 +61,6 @@ install(FILES
     scalable/emblems/remmina-nx-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/rdp/CMakeLists.txt b/plugins/rdp/CMakeLists.txt
index 573e9c5fb..9dccf2bb9 100644
--- a/plugins/rdp/CMakeLists.txt
+++ b/plugins/rdp/CMakeLists.txt
@@ -73,4 +73,6 @@ install(FILES
     scalable/emblems/remmina-rdp-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/spice/CMakeLists.txt b/plugins/spice/CMakeLists.txt
index e7c96a836..21291fe26 100644
--- a/plugins/spice/CMakeLists.txt
+++ b/plugins/spice/CMakeLists.txt
@@ -50,4 +50,6 @@ install(FILES
     scalable/emblems/remmina-spice-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/st/CMakeLists.txt b/plugins/st/CMakeLists.txt
index 10dfc7642..adf0ca9d1 100644
--- a/plugins/st/CMakeLists.txt
+++ b/plugins/st/CMakeLists.txt
@@ -49,4 +49,6 @@ install(FILES
     scalable/emblems/remmina-tool-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/vnc/CMakeLists.txt b/plugins/vnc/CMakeLists.txt
index f8cd1fdca..d64c94e7f 100644
--- a/plugins/vnc/CMakeLists.txt
+++ b/plugins/vnc/CMakeLists.txt
@@ -51,4 +51,6 @@ install(FILES
     scalable/emblems/remmina-vnc-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/www/CMakeLists.txt b/plugins/www/CMakeLists.txt
index e3fdd3747..66b9bc060 100644
--- a/plugins/www/CMakeLists.txt
+++ b/plugins/www/CMakeLists.txt
@@ -53,7 +53,9 @@ install(FILES
     scalable/emblems/remmina-www-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
 
 # In the feature we will have more resources to add, so I use a GLOB
 file(GLOB WWW_RES_FILES "${CMAKE_CURRENT_SOURCE_DIR}/resources/js/www-js.js")
diff --git a/plugins/xdmcp/CMakeLists.txt b/plugins/xdmcp/CMakeLists.txt
index 57da9b4bb..f353e257e 100644
--- a/plugins/xdmcp/CMakeLists.txt
+++ b/plugins/xdmcp/CMakeLists.txt
@@ -49,4 +49,6 @@ install(FILES
     scalable/emblems/remmina-xdmcp-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()