diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-01-04 10:14:13 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-01-14 21:31:08 +0000 |
| commit | 7fa8215febfc51dbce288e6f9c15c63d45fc8360 (patch) | |
| tree | 1a72e10972bce87004d0830de8a097182e735653 /cmake/modules/FindCARES.cmake | |
| parent | 33a8f5e7e65dc52b74b9acd811abc5049a39ba3c (diff) | |
Windows: Use a c-ares DLL built with vcpkg.
Update the Windows build environment to use c-ares packages built from
a VS 2017 command prompt with
set CARES_VERSION=1.15.0
vcpkg install c-ares:x86-windows c-ares:x64-windows
vcpkg export c-ares:x86-windows --output=c-ares-%CARES_VERSION%-win32ws --zip
vcpkg export c-ares:x64-windows --output=c-ares-%CARES_VERSION%-win64ws --zip
The packages also include a PDB, so copy it to the build directory and
add it to the PDB .zip.
Change-Id: I1887ca89d897bea184144315219b366096519961
Reviewed-on: https://code.wireshark.org/review/31376
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake/modules/FindCARES.cmake')
| -rw-r--r-- | cmake/modules/FindCARES.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cmake/modules/FindCARES.cmake b/cmake/modules/FindCARES.cmake index 2725a61d44..e3794a9bb6 100644 --- a/cmake/modules/FindCARES.cmake +++ b/cmake/modules/FindCARES.cmake @@ -45,13 +45,18 @@ IF(CARES_FOUND) CACHE PATH "Path to C-Ares DLL" ) file( GLOB _cares_dll RELATIVE "${CARES_DLL_DIR}" - "${CARES_DLL_DIR}/libcares-*.dll" + "${CARES_DLL_DIR}/cares.dll" ) set ( CARES_DLL ${_cares_dll} - # We're storing filenames only. Should we use STRING instead? CACHE FILEPATH "C-Ares DLL file name" ) - mark_as_advanced( CARES_DLL_DIR CARES_DLL ) + file( GLOB _cares_pdb RELATIVE "${CARES_DLL_DIR}" + "${CARES_DLL_DIR}/cares.pdb" + ) + set ( CARES_PDB ${_cares_pdb} + CACHE FILEPATH "C-Ares PDB file name" + ) + mark_as_advanced( CARES_DLL_DIR CARES_DLL CARES_PDB ) endif() ELSE(CARES_FOUND) SET( CARES_LIBRARIES ) |