Wireshark · Wireshark-commits: [Wireshark-commits] master-3.2 55414d3: CMake: FindGLIB2 depends on FindWSLibrary module

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=55414d3166233881f94dc94116a8f196f47f4390
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark

Commits:

55414d3 by Paul Aurich (paul@xxxxxxxxxxxxxx):

    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@xxxxxx>
    Petri-Dish: João Valverde <j@xxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit a3747ed9bbfaa3bee0ce4de1cf6cb81fd4a80551)
    Reviewed-on: https://code.wireshark.org/review/36510
    

Actions performed:

    from  b40bff9   SOMEIP: SD did not register port for IPv6 correctly (bugfix)
     add  55414d3   CMake: FindGLIB2 depends on FindWSLibrary module


Summary of changes:
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)