Wireshark · Wireshark-commits: [Wireshark-commits] master 8454f2a: CMake: Produce correct plugindir for pkg-config

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8454f2a20e250cef2c14601cf0cfc936025499db
Submitter: João Valverde (j@xxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

8454f2a by Michal Privoznik (mprivozn@xxxxxxxxxx):

    CMake: Produce correct plugindir for pkg-config
    
    So far the plugindir variable in the pkg-config file is set like
    this:
    
      set( plugindir "\${libdir}/${PLUGIN_INSTALL_DIR}" )
    
    where libdir is set to:
    
      set( libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" )
    
    However, PLUGIN_INSTALL_DIR already contains
    CMAKE_INSTALL_LIBDIR:
    
      set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/\
      ${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}")
    
    Therefore, if the pkg-config file is generated by cmake, the
    resulting plugindir points to:
    
       plugindir=${libdir}/lib/wireshark/plugins/2.1.0
       libdir=${exec_prefix}/lib
    
    This is obviously wrong as after variable substitution the
    resulting path is /usr/lib/lib/wireshark/plugins/...
    
    Change-Id: I448991284d8948434311b1c0828828fd93d0baf8
    Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/13258
    Tested-by: João Valverde <j@xxxxxx>
    Reviewed-by: João Valverde <j@xxxxxx>
    

Actions performed:

    from  4826746   More structure assignments for nstime_t.
    adds  8454f2a   CMake: Produce correct plugindir for pkg-config


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