diff options
| author | Martin Boye Petersen <martinboyepetersen@gmail.com> | 2019-12-19 15:10:23 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-01-07 12:45:53 +0000 |
| commit | 46b3753d531c10d7c54283a39d5dcfdcc8fc06fc (patch) | |
| tree | 22d6fab1837519dd701a8b5a6924cb4b17744f4e | |
| parent | 73a5236f2f3dde841ebdd9cf7114b29b213e2b2f (diff) | |
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 <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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") |