osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Fix more PkgConfig invocations with MSYS2

This commit is contained in:
João Valverde 2023-04-10 14:24:34 +01:00
parent cb58daab31
commit a508cfd2f2
20 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/FindBCG729.cmake
View File

@ -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()

2
cmake/modules/FindGMODULE2.cmake
View File

@ -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()

2
cmake/modules/FindGTHREAD2.cmake
View File

@ -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()

2
cmake/modules/FindILBC.cmake
View File

@ -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()

2
cmake/modules/FindKERBEROS.cmake
View File

@ -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()

2
cmake/modules/FindLUA.cmake
View File

@ -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)

2
cmake/modules/FindLZ4.cmake
View File

@ -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()

2
cmake/modules/FindLibXml2.cmake
View File

@ -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)

2
cmake/modules/FindMaxMindDB.cmake
View File

@ -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})

2
cmake/modules/FindMinizip.cmake
View File

@ -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()

2
cmake/modules/FindNGHTTP2.cmake
View File

@ -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()

2
cmake/modules/FindOPUS.cmake
View File

@ -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()

2
cmake/modules/FindPCAP.cmake
View File

@ -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()

2
cmake/modules/FindPCRE2.cmake
View File

@ -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()

2
cmake/modules/FindSNAPPY.cmake
View File

@ -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()

2
cmake/modules/FindSPANDSP.cmake
View File

@ -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)

2
cmake/modules/FindSinsp.cmake
View File

@ -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()

2
cmake/modules/FindSpeexDSP.cmake
View File

@ -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()

2
cmake/modules/FindZLIB.cmake
View File

@ -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()

2
cmake/modules/FindZSTD.cmake
View File

@ -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()