diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-04-19 22:55:24 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-04-20 10:46:19 +0000 |
| commit | 4704b89aa196266764d6930ef8039a47ba69f974 (patch) | |
| tree | 18ea6c42b7cef760daaf6382647cd7106aca7223 /cmake/modules | |
| parent | 2b65e9e74bd6156e0ffcb688c58412e9ddf72294 (diff) | |
Windows: add JSON-GLib library
Change-Id: I9b266bffc74779f9d28eabb5642644a2b0afa7cf
Reviewed-on: https://code.wireshark.org/review/27049
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindJSONGLIB.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmake/modules/FindJSONGLIB.cmake b/cmake/modules/FindJSONGLIB.cmake index 1f25f46550..8135813287 100644 --- a/cmake/modules/FindJSONGLIB.cmake +++ b/cmake/modules/FindJSONGLIB.cmake @@ -8,13 +8,13 @@ # Depends on FindGLIB2.cmake to include the gobject library. include(FindWSWinLibs) -FindWSWinLibs("libjson-glib-.*" "JSONGLIB_HINTS") +FindWSWinLibs("json-glib-*" "JSONGLIB_HINTS") find_path(JSONGLIB_INCLUDE_DIR NAMES json-glib/json-glib.h HINTS - ${JSONGLIB_HINTS} + "${JSONGLIB_HINTS}/include" PATHS /usr/include /usr/local/include @@ -31,7 +31,7 @@ find_library(JSONGLIB_LIBRARY json-glib-1.0 json-glib-1.0-0 HINTS - ${JSONGLIB_HINTS} + "${JSONGLIB_HINTS}/lib" PATHS /usr/lib /usr/local/lib @@ -43,14 +43,14 @@ find_library(JSONGLIB_LIBRARY if(WIN32) set(JSONGLIB_DLL_DIR "${JSONGLIB_HINTS}/bin" - CACHE PATH "Path to libjson-glib DLL" + CACHE PATH "Path to json-glib DLL" ) - file(GLOB _libssh_dll RELATIVE "${JSONGLIB_DLL_DIR}" - "${JSONGLIB_DLL_DIR}/json-glib-1.0.dll" + file(GLOB _jsonglib_dll RELATIVE "${JSONGLIB_DLL_DIR}" + "${JSONGLIB_DLL_DIR}/libjson-glib-1.0-0.dll" ) set(JSONGLIB_DLL ${_jsonglib_dll} # We're storing filenames only. Should we use STRING instead? - CACHE FILEPATH "libjson-glib DLL file name" + CACHE FILEPATH "json-glib DLL file name" ) mark_as_advanced(JSONGLIB_DLL_DIR JSONGLIB_DLL) endif() |