From e1b725d5bed2a576f51acf92c90a577fa384376d Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 4 Nov 2018 16:08:07 +0100
Subject: [PATCH] CMake: mark package variables as advanced

Silence pkg_check_modules message.
---
 build/cmake/config.cmake                 | 1 +
 build/cmake/modules/FindFontconfig.cmake | 2 +-
 build/cmake/modules/FindGStreamer.cmake  | 5 +++--
 build/cmake/modules/FindGTK3.cmake       | 2 +-
 build/cmake/modules/FindLibSoup.cmake    | 2 ++
 build/cmake/modules/FindLibsecret.cmake  | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
index bdb7ea8e04..04db51a020 100644
--- a/build/cmake/config.cmake
+++ b/build/cmake/config.cmake
@@ -65,6 +65,7 @@ function(wx_write_config)
     set(CXX ${CMAKE_CXX_COMPILER})
     set(DMALLOC_LIBS)
     find_program(EGREP egrep)
+    mark_as_advanced(EGREP)
     set(EXTRALIBS_GUI)
     set(EXTRALIBS_HTML)
     set(EXTRALIBS_SDL)
diff --git a/build/cmake/modules/FindFontconfig.cmake b/build/cmake/modules/FindFontconfig.cmake
index e6fa81d8ef..c7796b1643 100644
--- a/build/cmake/modules/FindFontconfig.cmake
+++ b/build/cmake/modules/FindFontconfig.cmake
@@ -43,7 +43,7 @@ else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
     find_package(PkgConfig)
-    pkg_check_modules(PC_FONTCONFIG fontconfig)
+    pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
 
     set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
   endif (NOT WIN32)
diff --git a/build/cmake/modules/FindGStreamer.cmake b/build/cmake/modules/FindGStreamer.cmake
index 2590b29f4a..8baf9cde7b 100644
--- a/build/cmake/modules/FindGStreamer.cmake
+++ b/build/cmake/modules/FindGStreamer.cmake
@@ -61,8 +61,7 @@ endif()
 #   _header is the component's header, relative to the gstreamer-${GST_LIB_VERSION} directory (eg. "gst/gst.h").
 #   _library is the component's library name (eg. "gstreamer" or "gstvideo")
 macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
-    # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
-    pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}-${GST_LIB_VERSION})
+    pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name}-${GST_LIB_VERSION})
 
     find_path(${_component_prefix}_INCLUDE_DIRS
         NAMES ${_header}
@@ -74,6 +73,8 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _librar
         NAMES ${_library}-${GST_LIB_VERSION}
         HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
     )
+
+    mark_as_advanced(${_component_prefix}_INCLUDE_DIRS ${_component_prefix}_LIBRARIES)
 endmacro()
 
 # ------------------------
diff --git a/build/cmake/modules/FindGTK3.cmake b/build/cmake/modules/FindGTK3.cmake
index 2b510aee5f..9f62658d0f 100644
--- a/build/cmake/modules/FindGTK3.cmake
+++ b/build/cmake/modules/FindGTK3.cmake
@@ -29,7 +29,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 find_package(PkgConfig)
-pkg_check_modules(GTK3 gtk+-3.0)
+pkg_check_modules(GTK3 QUIET gtk+-3.0)
 set(VERSION_OK TRUE)
 if (GTK3_VERSION)
 if (GTK3_FIND_VERSION_EXACT)
diff --git a/build/cmake/modules/FindLibSoup.cmake b/build/cmake/modules/FindLibSoup.cmake
index c7448921a9..8ce25561d8 100644
--- a/build/cmake/modules/FindLibSoup.cmake
+++ b/build/cmake/modules/FindLibSoup.cmake
@@ -52,3 +52,5 @@ endif()
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSoup REQUIRED_VARS LIBSOUP_INCLUDE_DIRS LIBSOUP_LIBRARIES
     VERSION_VAR   PC_LIBSOUP_VERSION)
+
+mark_as_advanced(LIBSOUP_LIBRARIES LIBSOUP_INCLUDE_DIRS)
diff --git a/build/cmake/modules/FindLibsecret.cmake b/build/cmake/modules/FindLibsecret.cmake
index d33228a77a..af1e059fcb 100644
--- a/build/cmake/modules/FindLibsecret.cmake
+++ b/build/cmake/modules/FindLibsecret.cmake
@@ -30,7 +30,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 find_package(PkgConfig)
-pkg_check_modules(LIBSECRET libsecret-1)
+pkg_check_modules(LIBSECRET QUIET libsecret-1)
 
 set(VERSION_OK TRUE)
 if (LIBSECRET_VERSION)