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

Windows: add nghttp2.pdb file to our PDB .zip 

Change-Id: I496959a04fdbd7a275d772600736bde63ac8b14e
Reviewed-on: https://code.wireshark.org/review/34307
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-08-16 21:45:43 +02:00
parent a3c81d328f
commit 41b8c22e74
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -1820,6 +1820,7 @@ if(WIN32)
endif(LZ4_FOUND)
if (NGHTTP2_FOUND)
list (APPEND OPTIONAL_DLLS "${NGHTTP2_DLL_DIR}/${NGHTTP2_DLL}")
list (APPEND OPTIONAL_PDBS "${NGHTTP2_DLL_DIR}/${NGHTTP2_PDB}")
endif(NGHTTP2_FOUND)
if (SBC_FOUND)
list (APPEND OPTIONAL_DLLS "${SBC_DLL_DIR}/${SBC_DLL}")

9
cmake/modules/FindNGHTTP2.cmake
View File

@ -44,10 +44,15 @@ if( NGHTTP2_FOUND )
"${NGHTTP2_DLL_DIR}/nghttp2.dll"
)
set ( NGHTTP2_DLL ${_nghttp2_dll}
# We're storing filenames only. Should we use STRING instead?
CACHE FILEPATH "nghttp2 DLL file name"
)
mark_as_advanced( NGHTTP2_DLL_DIR NGHTTP2_DLL )
file( GLOB _nghttp2_pdb RELATIVE "${NGHTTP2_DLL_DIR}"
"${NGHTTP2_DLL_DIR}/nghttp2.pdb"
)
set ( NGHTTP2_PDB ${_nghttp2_pdb}
CACHE FILEPATH "nghttp2 PDB file name"
)
mark_as_advanced( NGHTTP2_DLL_DIR NGHTTP2_DLL NGHTTP2_PDB )
endif()
else()
set( NGHTTP2_INCLUDE_DIRS )