From a508cfd2f2868ce17365f1ec236cddea187f1731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 10 Apr 2023 14:24:34 +0100 Subject: [PATCH] CMake: Fix more PkgConfig invocations with MSYS2 --- cmake/modules/FindBCG729.cmake | 2 +- cmake/modules/FindGMODULE2.cmake | 2 +- cmake/modules/FindGTHREAD2.cmake | 2 +- cmake/modules/FindILBC.cmake | 2 +- cmake/modules/FindKERBEROS.cmake | 2 +- cmake/modules/FindLUA.cmake | 2 +- cmake/modules/FindLZ4.cmake | 2 +- cmake/modules/FindLibXml2.cmake | 2 +- cmake/modules/FindMaxMindDB.cmake | 2 +- cmake/modules/FindMinizip.cmake | 2 +- cmake/modules/FindNGHTTP2.cmake | 2 +- cmake/modules/FindOPUS.cmake | 2 +- cmake/modules/FindPCAP.cmake | 2 +- cmake/modules/FindPCRE2.cmake | 2 +- cmake/modules/FindSNAPPY.cmake | 2 +- cmake/modules/FindSPANDSP.cmake | 2 +- cmake/modules/FindSinsp.cmake | 2 +- cmake/modules/FindSpeexDSP.cmake | 2 +- cmake/modules/FindZLIB.cmake | 2 +- cmake/modules/FindZSTD.cmake | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cmake/modules/FindBCG729.cmake b/cmake/modules/FindBCG729.cmake index 381fa0e366..37b56938ac 100644 --- a/cmake/modules/FindBCG729.cmake +++ b/cmake/modules/FindBCG729.cmake @@ -9,7 +9,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "bcg729-.*" "BCG729_HINTS" ) -if (NOT WIN32) +if (NOT USE_REPOSITORY) find_package(PkgConfig QUIET) pkg_search_module(BCG729 QUIET bcg729) endif() diff --git a/cmake/modules/FindGMODULE2.cmake b/cmake/modules/FindGMODULE2.cmake index 46ff224068..187faef4ab 100644 --- a/cmake/modules/FindGMODULE2.cmake +++ b/cmake/modules/FindGMODULE2.cmake @@ -10,7 +10,7 @@ include(FindWSWinLibs) FindWSWinLibs("vcpkg-export-*" "GMODULE2_HINTS") -if(NOT WIN32) +if(NOT USE_REPOSITORY) find_package(PkgConfig QUIET) pkg_check_modules(PC_GMODULE2 gmodule-2.0) endif() diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake index 3a3567591f..172ee5517e 100644 --- a/cmake/modules/FindGTHREAD2.cmake +++ b/cmake/modules/FindGTHREAD2.cmake @@ -10,7 +10,7 @@ include(FindWSWinLibs) FindWSWinLibs("vcpkg-export-*" "GTHREAD2_HINTS") -if(NOT WIN32) +if(NOT USE_REPOSITORY) find_package(PkgConfig QUIET) pkg_check_modules(PC_GTHREAD2 gthread-2.0) endif() diff --git a/cmake/modules/FindILBC.cmake b/cmake/modules/FindILBC.cmake index b2c5155106..bfe924b529 100644 --- a/cmake/modules/FindILBC.cmake +++ b/cmake/modules/FindILBC.cmake @@ -9,7 +9,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "libilbc-.*" "ILBC_HINTS" ) -if (NOT WIN32) +if (NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(PC_ILBC libilbc) endif() diff --git a/cmake/modules/FindKERBEROS.cmake b/cmake/modules/FindKERBEROS.cmake index 8a3c2c7625..2884fe37b7 100644 --- a/cmake/modules/FindKERBEROS.cmake +++ b/cmake/modules/FindKERBEROS.cmake @@ -21,7 +21,7 @@ endif() include(FindWSWinLibs) FindWSWinLibs("krb5-.*" "KERBEROS_HINTS") -if(NOT WIN32) +if(NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(KERBEROS krb5 mit-krb5 heimdal-krb5) endif() diff --git a/cmake/modules/FindLUA.cmake b/cmake/modules/FindLUA.cmake index bc2a41e1f6..23c03e059c 100644 --- a/cmake/modules/FindLUA.cmake +++ b/cmake/modules/FindLUA.cmake @@ -17,7 +17,7 @@ INCLUDE(FindWSWinLibs) FindWSWinLibs("lua-5*" "LUA_HINTS") -if(NOT WIN32) +if(NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51) if(NOT LUA_FOUND) diff --git a/cmake/modules/FindLZ4.cmake b/cmake/modules/FindLZ4.cmake index 30ce491894..83e639d5c3 100644 --- a/cmake/modules/FindLZ4.cmake +++ b/cmake/modules/FindLZ4.cmake @@ -11,7 +11,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "lz4-.*" "LZ4_HINTS" ) -if( NOT WIN32) +if( NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(LZ4 lz4 liblz4) endif() diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake index 6be8c0d3ac..f3e4762977 100644 --- a/cmake/modules/FindLibXml2.cmake +++ b/cmake/modules/FindLibXml2.cmake @@ -50,7 +50,7 @@ The following cache variables may also be set: include(FindWSWinLibs) FindWSWinLibs("vcpkg-export-.*" LIBXML2_HINTS) -if (NOT WIN32) # else we'll find Strawberry Perl's pkgconfig +if (NOT USE_REPOSITORY) # else we'll find Strawberry Perl's pkgconfig # use pkg-config to get the directories and then use these values # in the find_path() and find_library() calls find_package(PkgConfig QUIET) diff --git a/cmake/modules/FindMaxMindDB.cmake b/cmake/modules/FindMaxMindDB.cmake index 6e87a6b709..5de81a1130 100644 --- a/cmake/modules/FindMaxMindDB.cmake +++ b/cmake/modules/FindMaxMindDB.cmake @@ -16,7 +16,7 @@ ENDIF (MAXMINDDB_INCLUDE_DIRS) INCLUDE(FindWSWinLibs) FindWSWinLibs("libmaxminddb-.*" "MAXMINDDB_HINTS") -IF (NOT WIN32) +IF (NOT USE_REPOSITORY) find_package(PkgConfig) pkg_check_modules(PC_LIBMAXMINDDB QUIET libmaxminddb) set(MAXMINDDB_DEFINITIONS ${PC_LIBMAXMINDDB_CFLAGS_OTHER}) diff --git a/cmake/modules/FindMinizip.cmake b/cmake/modules/FindMinizip.cmake index c20062b436..9cfa28e581 100644 --- a/cmake/modules/FindMinizip.cmake +++ b/cmake/modules/FindMinizip.cmake @@ -7,7 +7,7 @@ FindWSWinLibs( "minizip-*" "MINIZIP_HINTS" ) -if(NOT WIN32) +if(NOT USE_REPOSITORY) find_package(PkgConfig QUIET) pkg_search_module(MINIZIP QUIET minizip) endif() diff --git a/cmake/modules/FindNGHTTP2.cmake b/cmake/modules/FindNGHTTP2.cmake index 8cd3ce274b..5f06dbe91a 100644 --- a/cmake/modules/FindNGHTTP2.cmake +++ b/cmake/modules/FindNGHTTP2.cmake @@ -9,7 +9,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "nghttp2-.*" "NGHTTP2_HINTS" ) -if( NOT WIN32) +if( NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(NGHTTP2 libnghttp2) endif() diff --git a/cmake/modules/FindOPUS.cmake b/cmake/modules/FindOPUS.cmake index 436911d8e5..0e7cfe2c7c 100644 --- a/cmake/modules/FindOPUS.cmake +++ b/cmake/modules/FindOPUS.cmake @@ -9,7 +9,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "opus-.*" "OPUS_HINTS" ) -if (NOT WIN32) +if (NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(OPUS opus) endif() diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index f033cc02c8..0dec6edf8d 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -12,7 +12,7 @@ FindWSWinLibs("libpcap-*" "PCAP_HINTS") # # First, try pkg-config on platforms other than Windows. # -if(NOT WIN32) +if(NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(PC_PCAP libpcap) endif() diff --git a/cmake/modules/FindPCRE2.cmake b/cmake/modules/FindPCRE2.cmake index 17c7b00c02..fb9b827d24 100644 --- a/cmake/modules/FindPCRE2.cmake +++ b/cmake/modules/FindPCRE2.cmake @@ -13,7 +13,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "pcre2-.*" "PCRE2_HINTS" ) -if( NOT WIN32) +if( NOT USE_REPOSITORY) find_package(PkgConfig QUIET) pkg_search_module(PC_PCRE2 QUIET "libpcre2-8") endif() diff --git a/cmake/modules/FindSNAPPY.cmake b/cmake/modules/FindSNAPPY.cmake index db3fd09168..afcfc71838 100644 --- a/cmake/modules/FindSNAPPY.cmake +++ b/cmake/modules/FindSNAPPY.cmake @@ -11,7 +11,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "snappy-.*" "SNAPPY_HINTS" ) -if( NOT WIN32) +if( NOT USE_REPOSITORY) find_package(PkgConfig QUIET) pkg_search_module(SNAPPY QUIET libsnappy) endif() diff --git a/cmake/modules/FindSPANDSP.cmake b/cmake/modules/FindSPANDSP.cmake index 37c327cecb..494f5a91a4 100644 --- a/cmake/modules/FindSPANDSP.cmake +++ b/cmake/modules/FindSPANDSP.cmake @@ -9,7 +9,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "spandsp-.*" "SPANDSP_HINTS" ) -if( NOT WIN32) +if( NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(SPANDSP spandsp) diff --git a/cmake/modules/FindSinsp.cmake b/cmake/modules/FindSinsp.cmake index d58a5130ed..9729b028f4 100644 --- a/cmake/modules/FindSinsp.cmake +++ b/cmake/modules/FindSinsp.cmake @@ -26,7 +26,7 @@ FindWSWinLibs( "libsinsp-.*" "SINSP_HINTS" ) include(CMakeDependentOption) -if( NOT WIN32) +if( NOT USE_REPOSITORY) find_package(PkgConfig) pkg_check_modules(SINSP libsinsp) endif() diff --git a/cmake/modules/FindSpeexDSP.cmake b/cmake/modules/FindSpeexDSP.cmake index cd6ada0c42..2df717d574 100644 --- a/cmake/modules/FindSpeexDSP.cmake +++ b/cmake/modules/FindSpeexDSP.cmake @@ -9,7 +9,7 @@ include(FindWSWinLibs) FindWSWinLibs("speexdsp-.*" "SPEEXDSP_HINTS") -if(NOT WIN32) +if(NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(PC_SPEEXDSP speexdsp) endif() diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake index 5fbe3eaa50..b6ac985892 100644 --- a/cmake/modules/FindZLIB.cmake +++ b/cmake/modules/FindZLIB.cmake @@ -45,7 +45,7 @@ if(MSVC) endif() if (NOT ZLIB_INCLUDE_DIR OR NOT ZLIB_LIBRARY) - if (NOT WIN32) # else we'll find Strawberry Perl's pkgconfig + if (NOT USE_REPOSITORY) # else we'll find Strawberry Perl's pkgconfig find_package(PkgConfig) pkg_search_module(ZLIB zlib) endif() diff --git a/cmake/modules/FindZSTD.cmake b/cmake/modules/FindZSTD.cmake index 3fefe0fa08..5107d6a3a2 100644 --- a/cmake/modules/FindZSTD.cmake +++ b/cmake/modules/FindZSTD.cmake @@ -11,7 +11,7 @@ include( FindWSWinLibs ) FindWSWinLibs( "zstd-.*" "ZSTD_HINTS" ) -if( NOT WIN32) +if( NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module(ZSTD libzstd) endif()