diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-11-30 14:57:01 -0800 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2020-12-01 08:32:44 +0000 |
| commit | 3a42bf0de2b9e35efcc3cea38153ab95cb71b352 (patch) | |
| tree | 0a87993bbfc6d22591416e314972e324c1f45358 /cmake/modules | |
| parent | 6ba539fe05b8ab1703e814763d1298d857bf875d (diff) | |
Windows: Upgrade brotli, libmaxminddb, lz4, and snappy.
Upgrade brotli to 1.0.9, libmaxminddb to 1.4.3, lz4 to 1.9.2, and snappy
to 1.1.8.
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindMaxMindDB.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindSNAPPY.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/modules/FindMaxMindDB.cmake b/cmake/modules/FindMaxMindDB.cmake index 3f1c5636c3..6e87a6b709 100644 --- a/cmake/modules/FindMaxMindDB.cmake +++ b/cmake/modules/FindMaxMindDB.cmake @@ -14,7 +14,7 @@ IF (MAXMINDDB_INCLUDE_DIRS) ENDIF (MAXMINDDB_INCLUDE_DIRS) INCLUDE(FindWSWinLibs) -FindWSWinLibs("MaxMindDB-.*" "MAXMINDDB_HINTS") +FindWSWinLibs("libmaxminddb-.*" "MAXMINDDB_HINTS") IF (NOT WIN32) find_package(PkgConfig) @@ -57,7 +57,7 @@ IF(MAXMINDDB_FOUND) CACHE PATH "Path to the MaxMindDB DLL" ) file( GLOB _MAXMINDDB_dll RELATIVE "${MAXMINDDB_DLL_DIR}" - "${MAXMINDDB_DLL_DIR}/libmaxminddb-*.dll" + "${MAXMINDDB_DLL_DIR}/libmaxminddb*.dll" ) set ( MAXMINDDB_DLL ${_MAXMINDDB_dll} # We're storing filenames only. Should we use STRING instead? diff --git a/cmake/modules/FindSNAPPY.cmake b/cmake/modules/FindSNAPPY.cmake index 87dd08bbe7..db3fd09168 100644 --- a/cmake/modules/FindSNAPPY.cmake +++ b/cmake/modules/FindSNAPPY.cmake @@ -42,7 +42,7 @@ if( SNAPPY_FOUND ) CACHE PATH "Path to Snappy DLL" ) file( GLOB _snappy_dll RELATIVE "${SNAPPY_DLL_DIR}" - "${SNAPPY_DLL_DIR}/libsnappy-*.dll" + "${SNAPPY_DLL_DIR}/snappy*.dll" ) set ( SNAPPY_DLL ${_snappy_dll} # We're storing filenames only. Should we use STRING instead? |