From 46b3753d531c10d7c54283a39d5dcfdcc8fc06fc Mon Sep 17 00:00:00 2001 From: Martin Boye Petersen Date: Thu, 19 Dec 2019 15:10:23 +0100 Subject: case-sensitive: Fix casing for PCAP and WinSparkle CMake is unable to find PCAP and WinSparkle under Windows when using case sensitive folders. Change-Id: I30ba4073afc6089b08cef3c010b09c257362929b Reviewed-on: https://code.wireshark.org/review/35505 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- CMakeLists.txt | 2 +- cmake/modules/FindPCAP.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 799b7150ab..917fadee07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1188,7 +1188,7 @@ else() endif() # Windows version updates -ws_find_package(WINSPARKLE ENABLE_WINSPARKLE HAVE_SOFTWARE_UPDATE) +ws_find_package(WinSparkle ENABLE_WINSPARKLE HAVE_SOFTWARE_UPDATE) find_package( Asciidoctor 1.5 ) diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index eab41f185c..6e0393ba26 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -114,7 +114,7 @@ find_path(PCAP_INCLUDE_DIR HINTS ${PC_PCAP_INCLUDE_DIRS} ${PCAP_CONFIG_INCLUDE_DIRS} - "${PCAP_HINTS}/include" + "${PCAP_HINTS}/Include" ) find_library(PCAP_LIBRARY @@ -124,7 +124,7 @@ find_library(PCAP_LIBRARY HINTS ${PC_PCAP_LIBRARY_DIRS} ${PCAP_CONFIG_LIBRARY_DIRS} - "${PCAP_HINTS}/lib${_PLATFORM_SUBDIR}" + "${PCAP_HINTS}/Lib${_PLATFORM_SUBDIR}" ) if(UNIX AND CMAKE_FIND_LIBRARY_SUFFIXES STREQUAL ".a") -- cgit v1.2.3