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>
This commit is contained in:
parent
2b65e9e74b
commit
4704b89aa1
|
@ -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()
|
||||
|
|
|
@ -123,7 +123,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.nsh" "${_config_nsh_contents}")
|
|||
# all-manifest.nsh. Can be created at configure time.
|
||||
set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh")
|
||||
set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n")
|
||||
foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS}
|
||||
foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${JSONGLIB_DLL}
|
||||
${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL}
|
||||
${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL}
|
||||
${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL}
|
||||
|
|
|
@ -122,7 +122,7 @@ file(APPEND "${_all_manifest_wix}" "<?include InputPaths.wxi ?>\n")
|
|||
file(APPEND "${_all_manifest_wix}" " <Fragment>\n")
|
||||
file(APPEND "${_all_manifest_wix}" " <DirectoryRef Id=\"INSTALLFOLDER\">\n")
|
||||
SET(unique_component "")
|
||||
foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS}
|
||||
foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${JSONGLIB_DLL}
|
||||
${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL}
|
||||
${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL}
|
||||
${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL}
|
||||
|
|
|
@ -97,6 +97,7 @@ $Win64Archives = @{
|
|||
"c-ares-1.14.0-win64ws.zip" = "";
|
||||
"gnutls-3.4.11-1.35-win64ws.zip" = "";
|
||||
"glib2-2.52.2-1.31-win64ws.zip" = "";
|
||||
"json-glib-1.0.2-4.31-win64ws.zip" = "";
|
||||
"kfw-3-2-2-x64-ws.zip" = "";
|
||||
"libgcrypt-1.7.6-win64ws.zip" = "";
|
||||
"libsmi-svn-40773-win64ws.zip" = "";
|
||||
|
@ -120,6 +121,7 @@ $Win32Archives = @{
|
|||
"c-ares-1.14.0-win32ws.zip" = "";
|
||||
"gnutls-3.4.11-1.36-win32ws.zip" = "";
|
||||
"glib2-2.52.2-1.34-win32ws.zip" = "";
|
||||
"json-glib-1.0.2-4.37-win32ws.zip" = "";
|
||||
"kfw-3-2-2-i386-ws-vc6.zip" = "";
|
||||
"libgcrypt-1.7.6-win32ws.zip" = "";
|
||||
"libsmi-svn-40773-win32ws.zip" = "";
|
||||
|
@ -169,6 +171,7 @@ $CleanupItems = @(
|
|||
"glib2-2.*-win??ws"
|
||||
"gtk2"
|
||||
"gtk3"
|
||||
"json-glib-1.0.2-*-win??ws"
|
||||
"kfw-3-2-2-final"
|
||||
"kfw-3-2-2-i386-ws-vc6"
|
||||
"kfw-3-2-2-x64-ws"
|
||||
|
|
Loading…
Reference in New Issue