diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-08-01 11:25:08 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-08-01 18:28:53 +0000 |
| commit | fb526204f81c2cac8499cc5c9db569750186ad34 (patch) | |
| tree | f497a80ba7189a4a6294318dc0667d0639bffb91 /cmake/modules | |
| parent | fbc1a9af1478ca3d84388c52c14ad86cf5e33e2f (diff) | |
| download | wireshark-fb526204f81c2cac8499cc5c9db569750186ad34.tar.gz | |
Fix the CMake WinPcap library path check.
Look for wpcap.lib in WpdPack/Lib/x64 when our target platform is Win64.
Change-Id: I9a1bac22106bcb6a1f155ce83c02e344e6ec0d55
Reviewed-on: https://code.wireshark.org/review/3331
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 487a729318..3514a9ffc7 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -9,6 +9,12 @@ include( FindWSWinLibs ) FindWSWinLibs( "WpdPack" "PCAP_HINTS" ) +# The 64-bit wpcap.lib is under /x64 +set ( _PLATFORM_SUBDIR "" ) +if( WIN32 AND $ENV{WIRESHARK_TARGET_PLATFORM} MATCHES "64" ) + set ( _PLATFORM_SUBDIR "/x64" ) +endif() + find_path( PCAP_INCLUDE_DIR NAMES pcap/pcap.h @@ -22,7 +28,7 @@ find_library( PCAP_LIBRARY pcap wpcap HINTS - "${PCAP_HINTS}/lib" + "${PCAP_HINTS}/lib${_PLATFORM_SUBDIR}" ) |