CMake: Make pkg-config optional in FindXXX modules

21 files changed, 86 insertions, 44 deletions

diff --git a/cmake/modules/FindChromaprint.cmake b/cmake/modules/FindChromaprint.cmake
index fe13ff921b..65c68397aa 100644
--- a/cmake/modules/FindChromaprint.cmake
+++ b/cmake/modules/FindChromaprint.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_CHROMAPRINT QUIET libchromaprint)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Chromaprint QUIET libchromaprint)
+endif()
 
 find_path(Chromaprint_INCLUDE_DIR
   NAMES chromaprint.h
diff --git a/cmake/modules/FindEbur128.cmake b/cmake/modules/FindEbur128.cmake
index 0e1e9914d8..fd76f0a488 100644
--- a/cmake/modules/FindEbur128.cmake
+++ b/cmake/modules/FindEbur128.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_CHROMAPRINT QUIET libebur128)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Ebur128 QUIET libebur128)
+endif()
 
 find_path(Ebur128_INCLUDE_DIR
   NAMES ebur128.h
diff --git a/cmake/modules/FindFLAC.cmake b/cmake/modules/FindFLAC.cmake
index 09d16343d5..6b17592b0b 100644
--- a/cmake/modules/FindFLAC.cmake
+++ b/cmake/modules/FindFLAC.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_FLAC QUIET flac)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_FLAC QUIET flac)
+endif()
 
 find_path(FLAC_INCLUDE_DIR
   NAMES FLAC/all.h
diff --git a/cmake/modules/FindGLIB.cmake b/cmake/modules/FindGLIB.cmake
index 71c982cd4c..e7e3dac05e 100644
--- a/cmake/modules/FindGLIB.cmake
+++ b/cmake/modules/FindGLIB.cmake
@@ -41,8 +41,10 @@
 # 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(PC_GLIB QUIET glib-2.0)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_GLIB QUIET glib-2.0)
+endif()
 
 find_library(GLIB_LIBRARIES
     NAMES glib-2.0
diff --git a/cmake/modules/FindGPerfTools.cmake b/cmake/modules/FindGPerfTools.cmake
index 370f061c87..b8f659b093 100644
--- a/cmake/modules/FindGPerfTools.cmake
+++ b/cmake/modules/FindGPerfTools.cmake
@@ -49,9 +49,12 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_GPerfTools_TCMALLOC QUIET libtcmalloc)
+  pkg_check_modules(PC_GPerfTools_PROFILER QUIET libprofiler)
+endif()
 
-pkg_check_modules(PC_GPerfTools_TCMALLOC QUIET libtcmalloc)
 find_path(GPerfTools_TCMALLOC_INCLUDE_DIR
   NAMES gperftools/tcmalloc.h
   PATHS ${PC_GPerfTools_TCMALLOC_INCLUDE_DIRS}
@@ -65,7 +68,6 @@ find_library(GPerfTools_TCMALLOC_LIBRARY
 )
 mark_as_advanced(GPerfTools_TCMALLOC_LIBRARY)
 
-pkg_check_modules(PC_GPerfTools_PROFILER QUIET libprofiler)
 find_path(GPerfTools_PROFILER_INCLUDE_DIR
   NAMES gperftools/profiler.h
   PATHS ${PC_GPerfTools_PROFILER_INCLUDE_DIRS}
diff --git a/cmake/modules/FindHIDAPI.cmake b/cmake/modules/FindHIDAPI.cmake
index 86e3ca6670..fcf37d1d2b 100644
--- a/cmake/modules/FindHIDAPI.cmake
+++ b/cmake/modules/FindHIDAPI.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_HIDAPI QUIET hidapi-libusb)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_HIDAPI QUIET hidapi-libusb)
+endif()
 
 find_path(HIDAPI_INCLUDE_DIR
   NAMES hidapi.h
diff --git a/cmake/modules/FindID3Tag.cmake b/cmake/modules/FindID3Tag.cmake
index b97d8f33b2..aca75e7daa 100644
--- a/cmake/modules/FindID3Tag.cmake
+++ b/cmake/modules/FindID3Tag.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_ID3Tag QUIET id3tag)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_ID3Tag QUIET id3tag)
+endif()
 
 find_path(ID3Tag_INCLUDE_DIR
   NAMES id3tag.h
diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/FindLibUSB.cmake
index 39c6e39fe1..f227327f72 100644
--- a/cmake/modules/FindLibUSB.cmake
+++ b/cmake/modules/FindLibUSB.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_LibUSB QUIET libusb-1.0)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_LibUSB QUIET libusb-1.0)
+endif()
 
 find_path(LibUSB_INCLUDE_DIR
   NAMES libusb.h
diff --git a/cmake/modules/FindLilv.cmake b/cmake/modules/FindLilv.cmake
index f4ccfb13fc..95848c430e 100644
--- a/cmake/modules/FindLilv.cmake
+++ b/cmake/modules/FindLilv.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_Lilv QUIET lilv-0)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Lilv QUIET lilv-0)
+endif()
 
 find_path(Lilv_INCLUDE_DIR
   NAMES lilv-0/lilv/lilv.h
diff --git a/cmake/modules/FindMAD.cmake b/cmake/modules/FindMAD.cmake
index 3d838df78a..0974ace10c 100644
--- a/cmake/modules/FindMAD.cmake
+++ b/cmake/modules/FindMAD.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_MAD QUIET mad)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_MAD QUIET mad)
+endif()
 
 find_path(MAD_INCLUDE_DIR
   NAMES mad.h
diff --git a/cmake/modules/FindMP4.cmake b/cmake/modules/FindMP4.cmake
index bc26a67a8b..b66cb56648 100644
--- a/cmake/modules/FindMP4.cmake
+++ b/cmake/modules/FindMP4.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_MP4 QUIET mp4)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_MP4 QUIET mp4)
+endif()
 
 find_path(MP4_INCLUDE_DIR
   NAMES mp4/mp4.h
diff --git a/cmake/modules/FindMP4v2.cmake b/cmake/modules/FindMP4v2.cmake
index b2304c5daf..fc39d5e79d 100644
--- a/cmake/modules/FindMP4v2.cmake
+++ b/cmake/modules/FindMP4v2.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_MP4v2 QUIET mp4v2)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_MP4v2 QUIET mp4v2)
+endif()
 
 find_path(MP4v2_INCLUDE_DIR
   NAMES mp4v2/mp4v2.h
diff --git a/cmake/modules/FindModplug.cmake b/cmake/modules/FindModplug.cmake
index 6e8fce7c65..b99d8bdfc5 100644
--- a/cmake/modules/FindModplug.cmake
+++ b/cmake/modules/FindModplug.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_Modplug QUIET libmodplug)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Modplug QUIET libmodplug)
+endif()
 
 find_path(Modplug_INCLUDE_DIR
   NAMES libmodplug/modplug.h
diff --git a/cmake/modules/FindOpus.cmake b/cmake/modules/FindOpus.cmake
index 61ce265cec..67d2a8562d 100644
--- a/cmake/modules/FindOpus.cmake
+++ b/cmake/modules/FindOpus.cmake
@@ -39,9 +39,11 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_Opus QUIET opus)
-pkg_check_modules(PC_OpusFile QUIET opusfile)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Opus QUIET opus)
+  pkg_check_modules(PC_OpusFile QUIET opusfile)
+endif()
 
 find_path(Opus_INCLUDE_DIR
   NAMES opus/opus.h
diff --git a/cmake/modules/FindPortAudio.cmake b/cmake/modules/FindPortAudio.cmake
index 8aa17d4448..eb4e465ba3 100644
--- a/cmake/modules/FindPortAudio.cmake
+++ b/cmake/modules/FindPortAudio.cmake
@@ -5,8 +5,10 @@
 #  PORTAUDIO_INCLUDE_DIRS - the Portaudio include directory
 #  PORTAUDIO_LIBRARIES - Link these to use Portaudio
 
-include(FindPkgConfig)
-pkg_check_modules(PC_PORTAUDIO portaudio-2.0)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_PORTAUDIO portaudio-2.0)
+endif()
 
 find_path(PORTAUDIO_INCLUDE_DIRS
   NAMES
diff --git a/cmake/modules/FindRubberband.cmake b/cmake/modules/FindRubberband.cmake
index cc1c956053..7331388949 100644
--- a/cmake/modules/FindRubberband.cmake
+++ b/cmake/modules/FindRubberband.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_Rubberband QUIET rubberband)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Rubberband QUIET rubberband)
+endif()
 
 find_path(Rubberband_INCLUDE_DIR
   NAMES rubberband/RubberBandStretcher.h
diff --git a/cmake/modules/FindSQLite3.cmake b/cmake/modules/FindSQLite3.cmake
index 53d66f2058..9a6eae403d 100644
--- a/cmake/modules/FindSQLite3.cmake
+++ b/cmake/modules/FindSQLite3.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_SQLite3 QUIET sqlite3)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_SQLite3 QUIET sqlite3)
+endif()
 
 find_path(SQLite3_INCLUDE_DIR
   NAMES sqlite3.h
diff --git a/cmake/modules/FindShout.cmake b/cmake/modules/FindShout.cmake
index 24934ce718..dc302a2429 100644
--- a/cmake/modules/FindShout.cmake
+++ b/cmake/modules/FindShout.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_Shout QUIET shout)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Shout QUIET shout)
+endif()
 
 find_path(Shout_INCLUDE_DIR
   NAMES shout/shout.h
diff --git a/cmake/modules/FindSndFile.cmake b/cmake/modules/FindSndFile.cmake
index 6568589168..6f8e340c8c 100644
--- a/cmake/modules/FindSndFile.cmake
+++ b/cmake/modules/FindSndFile.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_SndFile QUIET sndfile)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_SndFile QUIET sndfile)
+endif()
 
 find_path(SndFile_INCLUDE_DIR
   NAMES sndfile.h
diff --git a/cmake/modules/FindUpower.cmake b/cmake/modules/FindUpower.cmake
index 4d7b91aa9c..5e45d719b6 100644
--- a/cmake/modules/FindUpower.cmake
+++ b/cmake/modules/FindUpower.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_Upower QUIET upower-glib)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_Upower QUIET upower-glib)
+endif()
 
 find_path(Upower_INCLUDE_DIR
   NAMES upower.h
diff --git a/cmake/modules/FindWavPack.cmake b/cmake/modules/FindWavPack.cmake
index 4bafc81f25..420c97465a 100644
--- a/cmake/modules/FindWavPack.cmake
+++ b/cmake/modules/FindWavPack.cmake
@@ -43,8 +43,10 @@ The following cache variables may also be set:
 
 #]=======================================================================]
 
-find_package(PkgConfig)
-pkg_check_modules(PC_WavPack QUIET wavpack)
+find_package(PkgConfig QUIET)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_WavPack QUIET wavpack)
+endif()
 
 find_path(WavPack_INCLUDE_DIR
   NAMES wavpack/wavpack.h