diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-03-07 22:10:31 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-03-09 11:20:41 +0000 |
| commit | 4e6d989df43af78439fccd24a176a14c534aea99 (patch) | |
| tree | fe3e181869ec7deacc248bf1ae0f4c824761eddd /cmake | |
| parent | 572f78a8610282151e7d165b11e0bf5092efbb5a (diff) | |
Add MaxMindDB 1.3.2 library to Windows
Change-Id: I328b6a05cc356be59ac63e80eae55a832bf76a47
Reviewed-on: https://code.wireshark.org/review/26347
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindMaxMindDB.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/modules/FindMaxMindDB.cmake b/cmake/modules/FindMaxMindDB.cmake index cad4499e5b..3f1c5636c3 100644 --- a/cmake/modules/FindMaxMindDB.cmake +++ b/cmake/modules/FindMaxMindDB.cmake @@ -25,12 +25,13 @@ endif() FIND_PATH(MAXMINDDB_INCLUDE_DIR maxminddb.h HINTS ${PC_LIBMAXMINDDB_INCLUDEDIR} ${PC_LIBMAXMINDDB_INCLUDE_DIRS} + "${MAXMINDDB_HINTS}/include" PATH_SUFFIXES maxminddb ) find_library(MAXMINDDB_LIBRARY NAMES - maxminddb libmaxminddb + maxminddb libmaxminddb libmaxminddb-0 HINTS ${PC_LIBMAXMINDDB_LIBDIR} ${PC_LIBMAXMINDDB_LIBRARY_DIRS} "${MAXMINDDB_HINTS}/lib" @@ -56,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? |