diff options
| author | Paul Aurich <paul@darkrain42.org> | 2020-03-19 20:18:41 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2020-03-20 05:14:11 +0000 |
| commit | 378ecc27df67a5b9cc371c5e07a4376950fe5a2a (patch) | |
| tree | d3d7149358ae07c1b4405b61bb083795bfc57ff6 | |
| parent | 42010a64a4d5fcbaa78ccb186564786aaef3b5a0 (diff) | |
CMake: FindGLIB2 depends on FindWSLibrary module
Beginning in Wireshark 3.2, the FindGLIB2 cmake module depends on FindWSLibrary
(see 990e409273b), so FindWSLibrary needs to be installed as well, or
attempting to build an out-of-tree plugin fails.
Simple example CMakeLists.txt:
cmake_minimum_required(VERSION 2.8)
project(myplugin)
find_package(Wireshark)
LIST(APPEND CMAKE_MODULE_PATH "${Wireshark_LIB_DIR}/wireshark/cmake")
find_package(GLIB2)
Fails:
-- Checking for one of the modules 'glib-2.0'
CMake Error at /usr/local/lib/wireshark/cmake/FindGLIB2.cmake:49 (include):
include could not find load file:
FindWSLibrary
Call Stack (most recent call first):
CMakeLists.txt:5 (find_package)
CMake Error at /usr/local/lib/wireshark/cmake/FindGLIB2.cmake:50 (FindWSLibrary):
Unknown CMake command "FindWSLibrary".
Call Stack (most recent call first):
CMakeLists.txt:5 (find_package)
-- Configuring incomplete, errors occurred!
Change-Id: Id765d671e74fe15a60add38b95e62536abf60a79
Reviewed-on: https://code.wireshark.org/review/36509
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fed8fbd843..94ad63db66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3218,6 +3218,7 @@ endif() install( FILES ${CMAKE_MODULE_PATH}/FindGLIB2.cmake + ${CMAKE_MODULE_PATH}/FindWSLibrary.cmake ${CMAKE_MODULE_PATH}/FindWSWinLibs.cmake ${CMAKE_MODULE_PATH}/UseAsn2Wrs.cmake ${CMAKE_MODULE_PATH}/LocatePythonModule.cmake |